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

fix: resolve provider name case mismatch and 301 redirect in Go mode (#16889)

Browse Source
This commit is contained in:
euvre
2026-07-14 17:05:21 +08:00
committed by GitHub
parent 315e5725c2
commit 22dd1ad401
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/router/router.go
View File

@@ -522,8 +522,8 @@ func (r *Router) Setup(engine *gin.Engine) {
// provider pool route group
provider := v1.Group("/providers")
{
provider.GET("/", r.providerHandler.ListProviders)
provider.PUT("/", r.providerHandler.AddProvider)
provider.GET("", r.providerHandler.ListProviders)
provider.PUT("", r.providerHandler.AddProvider)
provider.GET("/:provider_name", r.providerHandler.ShowProvider)
provider.DELETE("/:provider_name", r.providerHandler.DeleteProvider)
provider.GET("/:provider_name/models", r.providerHandler.ListModels)
@@ -555,8 +555,8 @@ func (r *Router) Setup(engine *gin.Engine) {
{
// GET /models returns the tenant's added models across
// all instances. Front-end useFetchAllAddedModels consumes this.
model.GET("/", r.providerHandler.ListTenantAddedModels)
model.PATCH("/", r.tenantHandler.SetModels)
model.GET("", r.providerHandler.ListTenantAddedModels)
model.PATCH("", r.tenantHandler.SetModels)
// Tenant default-model selection (used by the agent page's useFetchDefaultModels hook)
model.GET("/default", r.tenantHandler.GetDefaultModels)
model.PATCH("/default", r.tenantHandler.SetDefaultModels)
@@ -589,8 +589,8 @@ func (r *Router) Setup(engine *gin.Engine) {
connectors := v1.Group("/connectors")
{
connectors.GET("/", r.connectorHandler.ListConnectors)
connectors.POST("/", r.connectorHandler.CreateConnector)
connectors.GET("", r.connectorHandler.ListConnectors)
connectors.POST("", r.connectorHandler.CreateConnector)
connectors.POST("/google/oauth/web/start", r.connectorHandler.StartGoogleWebOAuth)
connectors.POST("/google/oauth/web/result", r.connectorHandler.PollGoogleWebOAuthResult)
connectors.POST("/box/oauth/web/start", r.connectorHandler.StartBoxWebOAuth)

11
internal/service/model_service.go
View File

@@ -155,7 +155,6 @@ type CheckConnectionRequest struct {
func (m *ModelProviderService) AddModelProvider(providerName, userID string) (common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
tenants, err := m.userTenantDAO.GetByUserIDAndRole(userID, "owner")
if err != nil {
@@ -227,7 +226,10 @@ func (m *ModelProviderService) ListProvidersOfTenant(userID string) ([]map[strin
}
return nil, common.CodeServerError, err
}
provider["name"] = providerName
// provider["name"] is the catalog name from GetProviderByName (e.g.,
// "SILICONFLOW"), which matches Python's factory_info["name"]. Do NOT
// override it with providerName (the DB value), which may differ in
// case from historical ToLower writes.
// Set has_instance flag. Mirrors Python's:
// provider_obj = TenantModelProviderService.get_by_tenant_id_and_provider_name(tenant_id, name)
@@ -312,7 +314,6 @@ func (m *ModelProviderService) DeleteModelProvider(userID, providerName string)
func (m *ModelProviderService) ListSupportedModels(providerName, instanceName, userID string) ([]map[string]interface{}, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
// Get tenant ID from user
tenants, err := m.userTenantDAO.GetByUserIDAndRole(userID, "owner")
@@ -397,7 +398,6 @@ type CreateInstanceModelInfo struct {
func (m *ModelProviderService) CreateProviderInstance(providerName, instanceName, apiKey, baseURL, region, userID string, modelInfo []CreateInstanceModelInfo) (common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
// Get tenant ID from user
tenants, err := m.userTenantDAO.GetByUserIDAndRole(userID, "owner")
@@ -476,7 +476,6 @@ func (m *ModelProviderService) CreateProviderInstance(providerName, instanceName
// create_name_only_provider_instance in provider_api_service.py:536.
func (m *ModelProviderService) CreateNameOnlyProviderInstance(providerName, instanceName, userID string) (common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
if instanceName == "default" {
return common.CodeBadRequest, errors.New("instance name cannot be 'default'")
@@ -629,7 +628,6 @@ func (m *ModelProviderService) addModelToInstance(tenantID, providerName, instan
func (m *ModelProviderService) ListProviderInstances(providerName, userID string) ([]map[string]interface{}, common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
// Get tenant ID from user
tenants, err := m.userTenantDAO.GetByUserIDAndRole(userID, "owner")
@@ -1239,7 +1237,6 @@ func (m *ModelProviderService) resolveModelListTenant(userID, ownerTenantID stri
func (m *ModelProviderService) AlterProviderInstance(userID, providerName, instanceIDOrName, newInstanceName, apiKey, baseURL, region string, modelInfo []CreateInstanceModelInfo, verify bool) (common.ErrorCode, error) {
providerName = strings.TrimSpace(providerName)
providerName = strings.ToLower(providerName)
tenants, err := m.userTenantDAO.GetByUserIDAndRole(userID, "owner")
if err != nil {

2
web/src/utils/api.ts
View File

@@ -27,7 +27,7 @@ export default {
listAllAddedModels: `${restAPIv1}/models`,
defaultModel: `${restAPIv1}/models/default`,
listProviders: `${restAPIv1}/providers`,
addProvider: `${restAPIv1}/providers/`,
addProvider: `${restAPIv1}/providers`,
addProviderInstance: ({ llm_factory }: { llm_factory: string }) =>
`${restAPIv1}/providers/${llm_factory}/instances`,
verifyProviderConnection: ({ provider_name }: { provider_name: string }) =>