Feat: OpenAI-API-Compatible (#17276)

This commit is contained in:
Lynn
2026-07-23 13:39:57 +08:00
committed by GitHub
parent 64be8585aa
commit 4a2564c7da
5 changed files with 450 additions and 30 deletions

View File

@@ -0,0 +1,13 @@
{
"name": "OpenAI-API-Compatible",
"rank": 985,
"url_suffix": {
"chat": "chat/completions",
"models": "models",
"embedding": "embeddings",
"asr": "audio/transcriptions",
"tts": "audio/speech"
},
"class": "local",
"models": []
}

View File

@@ -55,6 +55,8 @@ func (f *ModelFactory) CreateModelDriver(providerName string, baseURL map[string
return NewVolcEngine(baseURL, urlSuffix), nil
case "vllm":
return NewVllmModel(baseURL, urlSuffix), nil
case "openai-api-compatible":
return NewOpenAIAPICompatibleModel(baseURL, urlSuffix), nil
case "xai":
return NewXAIModel(baseURL, urlSuffix), nil
case "lm-studio":

View File

@@ -0,0 +1,341 @@
//
// 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 (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"mime/multipart"
"net/http"
"os"
"path/filepath"
"strings"
"ragflow/internal/common"
)
// OpenAIAPICompatibleModel implements ModelDriver for any OpenAI-API-compatible
// provider. It reuses VllmModel's implementation via struct embedding, matching
// the Python backend where OpenAI-API-Compatible and VLLM share the same
// OpenAIAPIChat class.
type OpenAIAPICompatibleModel struct {
*VllmModel
}
// NewOpenAIAPICompatibleModel creates a new OpenAI-API-Compatible model instance
func NewOpenAIAPICompatibleModel(baseURL map[string]string, urlSuffix URLSuffix) *OpenAIAPICompatibleModel {
return &OpenAIAPICompatibleModel{
VllmModel: NewVllmModel(baseURL, urlSuffix),
}
}
// Name returns the provider identifier
func (m *OpenAIAPICompatibleModel) Name() string {
return "OpenAI-API-Compatible"
}
// NewInstance creates a new instance with the given baseURL, returning the
// same OpenAIAPICompatibleModel type.
func (m *OpenAIAPICompatibleModel) NewInstance(baseURL map[string]string) ModelDriver {
return NewOpenAIAPICompatibleModel(baseURL, m.baseModel.URLSuffix)
}
// ListModels overrides VllmModel.ListModels to apply hint-based model type
// inference and filter out models whose types cannot be mapped to any known
// RAGFlow LLM type (e.g. image-generation-only models).
func (m *OpenAIAPICompatibleModel) ListModels(ctx context.Context, apiConfig *APIConfig) ([]ListModelResponse, error) {
models, err := m.VllmModel.ListModels(ctx, apiConfig)
if err != nil {
return nil, err
}
filtered := make([]ListModelResponse, 0, len(models))
for _, model := range models {
inferred := InferModelTypes(model.Name)
if len(inferred) == 0 {
continue
}
model.ModelTypes = inferred
filtered = append(filtered, model)
}
return filtered, nil
}
// Hint keywords for model type inference, matching Python's
// OpenAIAPICompatible class-level hint constants.
var (
embeddingHints = []string{"embed", "embedding", "bge"}
rerankHints = []string{"rerank", "reranker"}
asrHints = []string{"asr", "stt", "transcribe", "transcriber", "whisper"}
ttsHints = []string{"tts", "text-to-speech"}
visionHints = []string{
"vl", "vision", "llava", "internvl", "minicpm-v",
"gpt-4o", "glm-4v", "qvq", "qwen-vl", "pixtral",
}
ocrHints = []string{"ocr"}
)
// containsHint checks whether modelName (lowercased) contains any of the
// given hint substrings.
func containsHint(modelName string, hints []string) bool {
for _, hint := range hints {
if strings.Contains(modelName, hint) {
return true
}
}
return false
}
// InferModelTypes derives RAGFlow LLM model types from the model name using
// keyword heuristics, covering all seven supported types: chat, embedding,
// rerank, asr, tts, ocr, and vision (always combined with chat).
func InferModelTypes(modelName string) []string {
lower := strings.ToLower(modelName)
if containsHint(lower, rerankHints) {
return []string{"rerank"}
}
if containsHint(lower, embeddingHints) {
return []string{"embedding"}
}
if containsHint(lower, asrHints) {
return []string{"asr"}
}
if containsHint(lower, ttsHints) {
return []string{"tts"}
}
if containsHint(lower, ocrHints) {
return []string{"ocr"}
}
types := []string{"chat"}
if containsHint(lower, visionHints) {
types = append(types, "vision")
}
return types
}
// ttsVoiceForModel maps model names to appropriate TTS voices for
// OpenAI-compatible providers (e.g. SiliconFlow). Returns "alloy" as
// the generic fallback.
func ttsVoiceForModel(modelName string) string {
lower := strings.ToLower(modelName)
switch {
case strings.Contains(lower, "cosyvoice"):
return modelName + ":anna"
case strings.Contains(lower, "fishaudio") || strings.Contains(lower, "fish-speech"):
return "alex"
case strings.Contains(lower, "chattts"):
return "alex"
case strings.Contains(lower, "gpt-sovits"):
return "alex"
case strings.Contains(lower, "bert-vits2"):
return "alex"
default:
return "alloy"
}
}
// AudioSpeech converts text to speech via the OpenAI-compatible
// POST /v1/audio/speech endpoint. It does not require a voice parameter,
// matching the behaviour of many OpenAI-compatible gateway providers (e.g.
// SiliconFlow) where voice is optional or provider-specific.
func (m *OpenAIAPICompatibleModel) AudioSpeech(ctx context.Context, modelName *string, audioContent *string, apiConfig *APIConfig, ttsConfig *TTSConfig, modelUsage *common.ModelUsage) (*TTSResponse, error) {
if err := m.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
if audioContent == nil || *audioContent == "" {
return nil, fmt.Errorf("audio content is empty")
}
if strings.TrimSpace(m.baseModel.URLSuffix.TTS) == "" {
return nil, fmt.Errorf("%s TTS URL suffix is not configured", m.Name())
}
reqCtx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)
defer cancel()
resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)
if err != nil {
return nil, err
}
url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), strings.TrimPrefix(m.baseModel.URLSuffix.TTS, "/"))
reqBody := map[string]interface{}{
"model": *modelName,
"input": *audioContent,
"voice": ttsVoiceForModel(*modelName),
}
if ttsConfig != nil {
if ttsConfig.Format != "" {
reqBody["response_format"] = ttsConfig.Format
}
if ttsConfig.Params != nil {
for key, value := range ttsConfig.Params {
reqBody[key] = value
}
}
}
jsonData, err := json.Marshal(reqBody)
if err != nil {
return nil, fmt.Errorf("failed to marshal request: %w", err)
}
req, err := http.NewRequestWithContext(reqCtx, "POST", url, bytes.NewBuffer(jsonData))
if err != nil {
return nil, fmt.Errorf("failed to create request: %w", err)
}
req.Header.Set("Content-Type", "application/json")
if auth := BearerAuth(apiConfig); auth != "" {
req.Header.Set("Authorization", auth)
}
resp, err := m.baseModel.httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("failed to send request: %w", err)
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("failed to read response body: %w", err)
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("%s TTS API error: %s, body: %s", m.Name(), resp.Status, string(body))
}
return &TTSResponse{Audio: body}, nil
}
// AudioSpeechWithSender streams text-to-speech audio chunks. This stub is
// intentionally not implemented; the non-streaming AudioSpeech suffices for
// connection verification and the streaming path is not currently required
// for OpenAI-API-Compatible providers.
func (m *OpenAIAPICompatibleModel) AudioSpeechWithSender(ctx context.Context, modelName *string, audioContent *string, apiConfig *APIConfig, ttsConfig *TTSConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) error {
return fmt.Errorf("%s audio speech streaming not implemented", m.Name())
}
// TranscribeAudio sends an audio file for speech-to-text transcription via
// the OpenAI-compatible POST /v1/audio/transcriptions endpoint (multipart).
func (m *OpenAIAPICompatibleModel) TranscribeAudio(ctx context.Context, modelName *string, file *string, apiConfig *APIConfig, asrConfig *ASRConfig, modelUsage *common.ModelUsage) (*ASRResponse, error) {
if err := m.baseModel.APIConfigCheck(apiConfig); err != nil {
return nil, err
}
if modelName == nil || *modelName == "" {
return nil, fmt.Errorf("model name is required")
}
if file == nil || *file == "" {
return nil, fmt.Errorf("file is missing")
}
if strings.TrimSpace(m.baseModel.URLSuffix.ASR) == "" {
return nil, fmt.Errorf("%s ASR URL suffix is not configured", m.Name())
}
reqCtx, cancel := context.WithTimeout(ctx, nonStreamCallTimeout)
defer cancel()
resolvedBaseURL, err := m.baseModel.GetBaseURL(apiConfig)
if err != nil {
return nil, err
}
url := fmt.Sprintf("%s/%s", strings.TrimSuffix(resolvedBaseURL, "/"), strings.TrimPrefix(m.baseModel.URLSuffix.ASR, "/"))
var body bytes.Buffer
writer := multipart.NewWriter(&body)
audioFile, err := os.Open(*file)
if err != nil {
return nil, fmt.Errorf("failed to open audio file: %w", err)
}
defer audioFile.Close()
part, err := writer.CreateFormFile("file", filepath.Base(*file))
if err != nil {
return nil, fmt.Errorf("failed to create multipart file: %w", err)
}
if _, err = io.Copy(part, audioFile); err != nil {
return nil, fmt.Errorf("failed to copy audio data: %w", err)
}
if err = writer.WriteField("model", *modelName); err != nil {
return nil, fmt.Errorf("failed to write model field: %w", err)
}
if asrConfig != nil && asrConfig.Params != nil {
for key, value := range asrConfig.Params {
strVal := fmt.Sprintf("%v", value)
if err = writer.WriteField(key, strVal); err != nil {
return nil, fmt.Errorf("failed to write field %s: %w", key, err)
}
}
}
if err = writer.Close(); err != nil {
return nil, fmt.Errorf("failed to close multipart writer: %w", err)
}
req, err := http.NewRequestWithContext(reqCtx, "POST", url, &body)
if err != nil {
return nil, fmt.Errorf("failed to create request: %w", err)
}
req.Header.Set("Content-Type", writer.FormDataContentType())
if auth := BearerAuth(apiConfig); auth != "" {
req.Header.Set("Authorization", auth)
}
resp, err := m.baseModel.httpClient.Do(req)
if err != nil {
return nil, fmt.Errorf("failed to send request: %w", err)
}
defer resp.Body.Close()
respBody, err := io.ReadAll(resp.Body)
if err != nil {
return nil, fmt.Errorf("failed to read response body: %w", err)
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("%s ASR API error: %s, body: %s", m.Name(), resp.Status, string(respBody))
}
var result struct {
Text string `json:"text"`
}
if err := json.Unmarshal(respBody, &result); err != nil {
return nil, fmt.Errorf("failed to unmarshal response: %w, body=%s", err, string(respBody))
}
return &ASRResponse{Text: result.Text}, nil
}
// TranscribeAudioWithSender streams ASR transcription. This stub is
// intentionally not implemented; the non-streaming TranscribeAudio suffices
// for connection verification.
func (m *OpenAIAPICompatibleModel) TranscribeAudioWithSender(ctx context.Context, modelName *string, file *string, apiConfig *APIConfig, asrConfig *ASRConfig, modelUsage *common.ModelUsage, sender func(*string, *string) error) error {
return fmt.Errorf("%s ASR streaming not implemented", m.Name())
}

View File

@@ -24,6 +24,7 @@ import (
"ragflow/internal/dao"
"ragflow/internal/entity/models"
"ragflow/internal/service"
"sort"
"strings"
"time"
@@ -147,12 +148,73 @@ func (h *ProviderHandler) ListModels(c *gin.Context) {
common.ResponseWithHttpCodeData(c, http.StatusBadRequest, 400, nil, "Provider name is required")
return
}
providerModels, err := dao.GetModelProviderManager().ListModels(providerName)
if err != nil {
common.ErrorWithCode(c, common.CodeNotFound, err.Error())
// 1. Get static models from config (may be nil when models list is empty)
staticModels, _ := dao.GetModelProviderManager().ListModels(providerName)
if staticModels == nil {
staticModels = []map[string]interface{}{}
}
// 2. Attempt live API fetch when api_key and base_url are provided
apiKey := c.Query("api_key")
baseURL := c.Query("base_url")
var remoteModels []map[string]interface{}
if apiKey != "" && baseURL != "" {
providerInfo := dao.GetModelProviderManager().FindProvider(providerName)
if providerInfo != nil && providerInfo.ModelDriver != nil {
region := "default"
baseURLByRegion := map[string]string{region: baseURL}
driver := providerInfo.ModelDriver.NewInstance(baseURLByRegion)
if driver != nil {
apiConfig := &models.APIConfig{
ApiKey: &apiKey,
Region: &region,
}
if liveModels, err := driver.ListModels(c.Request.Context(), apiConfig); err == nil {
for _, m := range liveModels {
remoteModels = append(remoteModels, map[string]interface{}{
"name": m.Name,
"model_types": m.ModelTypes,
"max_tokens": m.MaxTokens,
})
}
}
}
}
}
// 3. Both empty — return empty success
if len(staticModels) == 0 && len(remoteModels) == 0 {
common.SuccessWithData(c, []map[string]interface{}{}, "success")
return
}
common.SuccessWithData(c, providerModels, "success")
// 4. Merge: static as base, remote overrides on name conflicts
merged := make(map[string]map[string]interface{})
for _, m := range staticModels {
if name, ok := m["name"].(string); ok {
merged[name] = m
}
}
for _, m := range remoteModels {
if name, ok := m["name"].(string); ok {
merged[name] = m
}
}
// 5. Sort by name
result := make([]map[string]interface{}, 0, len(merged))
for _, m := range merged {
result = append(result, m)
}
sort.Slice(result, func(i, j int) bool {
ni, _ := result[i]["name"].(string)
nj, _ := result[j]["name"].(string)
return ni < nj
})
common.SuccessWithData(c, result, "success")
}
func (h *ProviderHandler) ShowModel(c *gin.Context) {
@@ -304,7 +366,7 @@ func (h *ProviderHandler) CheckConnection(c *gin.Context) {
}
userID := c.GetString("user_id")
errCode, err := h.modelProviderService.CheckConnection(ctx, providerName, req.APIKey, req.Region, req.BaseURL, req.InstanceID, userID, service.ListModelNames(req.ModelInfo))
errCode, err := h.modelProviderService.CheckConnection(ctx, providerName, req.APIKey, req.Region, req.BaseURL, req.InstanceID, userID, req.ModelInfo)
if err != nil {
common.ErrorWithCode(c, errCode, err.Error())
return

View File

@@ -158,16 +158,6 @@ type CheckConnectionModelInfo struct {
Extra map[string]interface{} `json:"extra"`
}
func ListModelNames(modelInfo []CheckConnectionModelInfo) []string {
names := make([]string, 0, len(modelInfo))
for _, mi := range modelInfo {
if mi.ModelName != "" {
names = append(names, mi.ModelName)
}
}
return names
}
type CheckConnectionRequest struct {
APIKey string `json:"api_key"`
Region string `json:"region"`
@@ -871,7 +861,7 @@ func (m *ModelProviderService) ShowInstanceBalance(ctx context.Context, provider
return result, common.CodeSuccess, nil
}
func (m *ModelProviderService) CheckConnection(ctx context.Context, providerName, apiKey, region, baseURL, instanceID, userID string, modelInfo []string) (common.ErrorCode, error) {
func (m *ModelProviderService) CheckConnection(ctx context.Context, providerName, apiKey, region, baseURL, instanceID, userID string, modelInfo []CheckConnectionModelInfo) (common.ErrorCode, error) {
providerInfo := dao.GetModelProviderManager().FindProvider(providerName)
if providerInfo == nil {
return common.CodeServerError, fmt.Errorf("provider %s not found", providerName)
@@ -976,26 +966,38 @@ func (m *ModelProviderService) updateModelVerifyResults(userID, providerName, in
}
// verifyProviderModel mirrors Python verify_api_key's model-level verification.
// It tries each model registered for the provider in the factory JSON config
// and returns a map of modelName → verify status ("success"/"fail") so the
// caller can persist the results to the database. A nil error means at least
// one model passed verification.
func verifyProviderModel(ctx context.Context, driver modelModule.ModelDriver, providerModels []*modelModule.Model, apiConfig *modelModule.APIConfig, modelInfo []string) (map[string]string, error) {
// It tries each model and returns a map of modelName → verify status
// ("success"/"fail") so the caller can persist the results to the database.
// A nil error means at least one model passed verification.
//
// When modelInfo is provided (non-empty), it is used directly as the source of
// models to verify — each entry carries model_name and model_type ([]string).
// When modelInfo is empty, the function falls back to the provider's static
// model catalog (providerModels).
func verifyProviderModel(ctx context.Context, driver modelModule.ModelDriver, providerModels []*modelModule.Model, apiConfig *modelModule.APIConfig, modelInfo []CheckConnectionModelInfo) (map[string]string, error) {
modelVerifyResult := make(map[string]string)
// Determine which models to verify: prefer the caller-supplied modelInfo
// list; fall back to the full provider model catalog.
// list; fall back to the full provider model catalog. Mirrors Pythons
// verify_api_key ll. 656671.
var modelsToVerify []*modelModule.Model
if len(modelInfo) > 0 {
providerModelMap := make(map[string]*modelModule.Model, len(providerModels))
for _, m := range providerModels {
providerModelMap[m.Name] = m
}
for _, name := range modelInfo {
name = strings.TrimSpace(name)
if m, ok := providerModelMap[name]; ok {
modelsToVerify = append(modelsToVerify, m)
for _, mi := range modelInfo {
modelName := strings.TrimSpace(mi.ModelName)
if modelName == "" {
continue
}
modelTypes := mi.ModelTypes
if len(modelTypes) == 0 {
// When the caller didn't supply model types, infer them from the
// model name using the same hint heuristics as Python's
// OpenAIAPICompatible._infer_model_types.
modelTypes = modelModule.InferModelTypes(modelName)
}
modelsToVerify = append(modelsToVerify, &modelModule.Model{
Name: modelName,
ModelTypes: modelTypes,
})
}
} else {
modelsToVerify = providerModels