mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-03 01:01:56 +08:00
220ee9dbfb
### What problem does this PR solve? Closes #15611. RAGFlow's fallback reasoning parser only recognized the exact model family `qwen3`. For provider-prefixed Qwen model names such as SiliconFlow's `qwen/qwen3-8b`, the derived model class can be `qwen/qwen3`, so inline `<think>...</think>` content was not split from the visible answer when `reasoning_content` was absent. This PR normalizes model-family detection before fallback reasoning extraction, keeps the parser nil-safe, and adds focused tests for Qwen3 variants plus Gitee and SiliconFlow chat responses. It also makes SiliconFlow propagate `ChatConfig.Thinking` into the chat request body, matching the existing Gitee behavior, so Qwen thinking mode is actually enabled when requested. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) - [x] Refactoring ### Validation - `/root/go/bin/gofmt -l internal/entity/models/common.go internal/entity/models/common_test.go internal/entity/models/reasoning_family_provider_test.go internal/entity/models/siliconflow.go` - `git diff --check` - `/root/go/bin/go test ./internal/entity/models -run 'Test(NormalizeModelFamily|GetThinkingAndAnswer|GiteeChatExtractsQwenThinkingFromInlineContent|SiliconflowChatExtractsProviderPrefixedQwenThinkingFromInlineContent)' -vet=off -count=1` Note: the full package command `/root/go/bin/go test ./internal/entity/models -vet=off -count=1` now runs locally, but it currently fails on an unrelated existing `TestAstraflowEmbedReturnsNoSuchMethod` panic in `internal/entity/models/astraflow.go:482`.
82 lines
2.0 KiB
Go
82 lines
2.0 KiB
Go
//
|
|
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//
|
|
|
|
package models
|
|
|
|
import "strings"
|
|
|
|
func GetThinkingAndAnswer(modelType *string, content *string) (*string, *string) {
|
|
if content == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
switch NormalizeModelFamily(modelType) {
|
|
case "qwen3":
|
|
return extractThinkContent(content)
|
|
}
|
|
return nil, content
|
|
}
|
|
|
|
// NormalizeModelFamily normalizes provider-prefixed model class/name strings for shared response parsing.
|
|
func NormalizeModelFamily(modelType *string) string {
|
|
if modelType == nil {
|
|
return ""
|
|
}
|
|
|
|
family := strings.ToLower(strings.TrimSpace(*modelType))
|
|
if family == "" {
|
|
return ""
|
|
}
|
|
|
|
if slash := strings.LastIndex(family, "/"); slash >= 0 && slash < len(family)-1 {
|
|
family = family[slash+1:]
|
|
}
|
|
|
|
if strings.HasPrefix(family, "qwen3") {
|
|
return "qwen3"
|
|
}
|
|
|
|
if dash := strings.Index(family, "-"); dash >= 0 {
|
|
family = family[:dash]
|
|
}
|
|
|
|
return family
|
|
}
|
|
|
|
func extractThinkContent(content *string) (*string, *string) {
|
|
if content == nil {
|
|
return nil, nil
|
|
}
|
|
|
|
startTag := "<think>"
|
|
endTag := "</think>"
|
|
|
|
startIdx := strings.Index(*content, startTag)
|
|
endIdx := strings.Index(*content, endTag)
|
|
|
|
if startIdx == -1 || endIdx == -1 || endIdx <= startIdx {
|
|
return nil, content
|
|
}
|
|
|
|
thinking := (*content)[startIdx+len(startTag) : endIdx]
|
|
answer := (*content)[endIdx+len(endTag):]
|
|
|
|
thinking = strings.TrimLeft(thinking, "\n")
|
|
answer = strings.TrimLeft(answer, "\n")
|
|
|
|
return &thinking, &answer
|
|
}
|