Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/api/providers/openrouter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import { BaseProvider } from "./base-provider"
import type { ApiHandlerCreateMessageMetadata, SingleCompletionHandler } from "../index"
import { handleOpenAIError } from "./utils/openai-error-handler"
import { generateImageWithProvider, ImageGenerationResult } from "./utils/image-generation"
import { sanitizeReasoningDetailId } from "./utils/sanitize-reasoning-id"

// Add custom interface for OpenRouter params.
type OpenRouterChatCompletionParams = OpenAI.Chat.ChatCompletionCreateParams & {
Expand Down Expand Up @@ -287,18 +286,18 @@ export class OpenRouterHandler extends BaseProvider implements SingleCompletionH
if (detail.data !== undefined) {
existing.data = (existing.data || "") + detail.data
}
// Update other fields if provided - sanitize ID to remove invalid characters
if (detail.id !== undefined) existing.id = sanitizeReasoningDetailId(detail.id)
// Update other fields if provided
if (detail.id !== undefined) existing.id = detail.id
if (detail.format !== undefined) existing.format = detail.format
if (detail.signature !== undefined) existing.signature = detail.signature
} else {
// Start new reasoning detail accumulation - sanitize ID to remove invalid characters
// Start new reasoning detail accumulation
reasoningDetailsAccumulator.set(key, {
type: detail.type,
text: detail.text,
summary: detail.summary,
data: detail.data,
id: sanitizeReasoningDetailId(detail.id),
id: detail.id,
format: detail.format,
signature: detail.signature,
index,
Expand Down
9 changes: 4 additions & 5 deletions src/api/providers/roo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { MODEL_DEFAULTS } from "../providers/fetchers/roo"
import { handleOpenAIError } from "./utils/openai-error-handler"
import { generateImageWithProvider, generateImageWithImagesApi, ImageGenerationResult } from "./utils/image-generation"
import { t } from "../../i18n"
import { sanitizeReasoningDetailId } from "./utils/sanitize-reasoning-id"

// Extend OpenAI's CompletionUsage to include Roo specific fields
interface RooUsage extends OpenAI.CompletionUsage {
Expand Down Expand Up @@ -194,18 +193,18 @@ export class RooHandler extends BaseOpenAiCompatibleProvider<string> {
if (detail.data !== undefined) {
existing.data = (existing.data || "") + detail.data
}
// Update other fields if provided - sanitize ID to remove invalid characters
if (detail.id !== undefined) existing.id = sanitizeReasoningDetailId(detail.id)
// Update other fields if provided
if (detail.id !== undefined) existing.id = detail.id
if (detail.format !== undefined) existing.format = detail.format
if (detail.signature !== undefined) existing.signature = detail.signature
} else {
// Start new reasoning detail accumulation - sanitize ID to remove invalid characters
// Start new reasoning detail accumulation
reasoningDetailsAccumulator.set(key, {
type: detail.type,
text: detail.text,
summary: detail.summary,
data: detail.data,
id: sanitizeReasoningDetailId(detail.id),
id: detail.id,
format: detail.format,
signature: detail.signature,
index,
Expand Down
59 changes: 0 additions & 59 deletions src/api/providers/utils/__tests__/sanitize-reasoning-id.spec.ts

This file was deleted.

16 changes: 0 additions & 16 deletions src/api/providers/utils/sanitize-reasoning-id.ts

This file was deleted.

Loading