zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-08-06 07:34:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(go-models): migrate batch 3 model drivers to unified handlers (#17698)

Browse Source 
## Summary

Relate to #17284

Migrate 10 OpenAI-compatible drivers (`minimax`, `mistral`,
`modelscope`, `moonshot`, `n1n`, `novita`, `ollama`, `openai`,
`openai_api_compatible`, `openrouter`) to use the unified response
handlers (`HandleNonStreamingResponse` / `HandleStreamingResponse`),
following the same pattern established by `deepseek` in #17634.

- Cut ~150 lines per driver (1692 lines removed, 172 added across 10
files).
- `openai_api_compatible` gains `ChatWithMessages` +
`ChatStreamlyWithSender` required by the unified handler infrastructure.
- `openai` driver preserves `reasoning_content` extraction for o-series
models.
- All drivers: pure deduplication of HTTP plumbing.

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
jay77721
2026-08-03 15:08:55 +08:00
committed by GitHub
parent bddc941814
commit 1478aa4ced
15 changed files with 447 additions and 1904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
internal/entity/models/parser_config.go
View File

@@ -16,8 +16,8 @@
package models
// ParserConfig maps a protocol to its usage parsers. Drivers select a
// ParserConfig instead of implementing usage extraction individually.
// ParserConfig maps a protocol to its usage and reasoning parsers. Drivers
// select a ParserConfig instead of implementing extraction individually.
type ParserConfig struct {
// Protocol is the protocol identifier (e.g. "openai", "claude").
Protocol string
@@ -25,12 +25,45 @@ type ParserConfig struct {
ResponseParser func(map[string]any) (*TokenUsage, bool)
// StreamParser extracts usage from one streaming event.
StreamParser func(map[string]any) (*TokenUsage, bool)
// ExtractStreamReasoning extracts the reasoning text from a parsed
// delta map (the delta field of one streaming event), if any.
// Defaults to reading delta.reasoning_content.
ExtractStreamReasoning func(delta map[string]any) string
}
// extractDefaultStreamReasoning reads the reasoning text from a parsed
// delta (delta.reasoning_content).
func extractDefaultStreamReasoning(delta map[string]any) string {
if r, ok := delta["reasoning_content"].(string); ok {
return r
}
return ""
}
// OpenAIParserConfig is the ParserConfig for OpenAI-compatible APIs
// (NVIDIA NIM, DeepSeek, Aliyun, Moonshot, xAI, OpenRouter, ...).
// (NVIDIA NIM, DeepSeek, Aliyun, Moonshot, xAI, ...).
var OpenAIParserConfig = &ParserConfig{
Protocol: "openai",
ResponseParser: extractOpenAIUsage,
StreamParser: extractOpenAIStreamUsage,
Protocol: "openai",
ResponseParser: extractOpenAIUsage,
StreamParser: extractOpenAIStreamUsage,
ExtractStreamReasoning: extractDefaultStreamReasoning,
}
// extractOpenRouterStreamReasoning reads the reasoning text from an
// OpenRouter streaming event. OpenRouter uses delta.reasoning (not
// delta.reasoning_content) for its reasoning content.
func extractOpenRouterStreamReasoning(delta map[string]any) string {
if r, ok := delta["reasoning"].(string); ok {
return r
}
return ""
}
// OpenRouterParserConfig is the ParserConfig for OpenRouter, which emits
// reasoning under delta.reasoning instead of delta.reasoning_content.
var OpenRouterParserConfig = &ParserConfig{
Protocol: "openai",
ResponseParser: extractOpenAIUsage,
StreamParser: extractOpenAIStreamUsage,
ExtractStreamReasoning: extractOpenRouterStreamReasoning,
}