-
-
Notifications
You must be signed in to change notification settings - Fork 178
fix: support Responses input string shortcut #708
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
FutureUnreal
wants to merge
2
commits into
ding113:dev
Choose a base branch
from
FutureUnreal:dev
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+74
−1
Open
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 |
|---|---|---|
|
|
@@ -20,6 +20,32 @@ import { ProxyStatusTracker } from "@/lib/proxy-status-tracker"; | |
| import { SessionTracker } from "@/lib/session-tracker"; | ||
| import type { ChatCompletionRequest } from "./types/compatible"; | ||
|
|
||
| function normalizeResponseInput(request: Record<string, unknown>): void { | ||
| if (!("input" in request)) return; | ||
|
|
||
| const input = request.input; | ||
|
|
||
| // OpenAI Responses API supports a string shortcut: | ||
| // { model, input: "hello" } -> [{ role: "user", content: [{ type: "input_text", text: "hello" }] }] | ||
| if (typeof input === "string") { | ||
| const text = input.trim(); | ||
| request.input = text.length | ||
| ? [ | ||
| { | ||
| role: "user", | ||
| content: [{ type: "input_text", text }], | ||
| }, | ||
| ] | ||
| : []; | ||
|
Comment on lines
+31
to
+39
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider whether whitespace-only input (e.g., Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! Prompt To Fix With AIThis is a comment left during a code review.
Path: src/app/v1/_lib/codex/chat-completions-handler.ts
Line: 31:39
Comment:
Consider whether whitespace-only input (e.g., `" "`) should be rejected with a validation error instead of silently converting to empty array `[]`
<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>
How can I resolve this? If you propose a fix, please make it concise. |
||
| return; | ||
FutureUnreal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| // Some clients may send a single object instead of an array. Wrap it for compatibility. | ||
| if (input && typeof input === "object" && !Array.isArray(input)) { | ||
| request.input = [input]; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 处理 OpenAI Compatible API 请求 (/v1/chat/completions) | ||
| * | ||
|
|
@@ -43,7 +69,12 @@ export async function handleChatCompletions(c: Context): Promise<Response> { | |
|
|
||
| // 格式检测 | ||
| const isOpenAIFormat = "messages" in request && Array.isArray(request.messages); | ||
| const isResponseAPIFormat = "input" in request && Array.isArray(request.input); | ||
| const inputValue = (request as Record<string, unknown>).input; | ||
| const isResponseAPIFormat = | ||
| "input" in request && | ||
| (Array.isArray(inputValue) || | ||
| typeof inputValue === "string" || | ||
| (typeof inputValue === "object" && inputValue !== null)); | ||
|
|
||
| if (!isOpenAIFormat && !isResponseAPIFormat) { | ||
| const response = new Response( | ||
|
|
@@ -158,6 +189,9 @@ export async function handleChatCompletions(c: Context): Promise<Response> { | |
| ); | ||
| return await attachSessionIdToErrorResponse(session.sessionId, response); | ||
| } | ||
|
|
||
| // Normalize for downstream guards/filters. | ||
| normalizeResponseInput(request as Record<string, unknown>); | ||
| } | ||
|
|
||
| const type = session.isCountTokensRequest() ? RequestType.COUNT_TOKENS : RequestType.CHAT; | ||
|
|
||
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
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.
In the normalized input, you're using
type: "input_text". However, other parts of the codebase, like the existing test caseResponse(input) 请求成功路径必须执行全链路 guards/filters 再 forward/dispatchintests/unit/proxy/chat-completions-handler-guard-pipeline.test.ts, usetype: "text". To maintain consistency and avoid potential issues in downstream processing, it would be better to use"text"here as well.