RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
update base db model (#21437)
Jin Hai7105b5dd34b2
diff --git a/internal/common/model_type.go b/internal/common/model.gosimilarity index 74%rename from internal/common/model_type.gorename to internal/common/model.goindex f511384bdf..01c1938893 100644--- a/internal/common/model_type.go+++ b/internal/common/model.go@@ -18,6 +18,7 @@ package commonimport ("fmt"+ "strings""time")@@ -65,3 +66,22 @@ type OperationLog struct {Message string `json:"message"`DurationMS int64 `json:"duration_ms"`}++func ParseCompositeModelName(compositeName string) (modelName, instanceName, providerName string, err error) {+ parts := strings.Split(compositeName, "@")+ switch len(parts) {+ case 3:+ // Format: model@instance@provider+ return parts[0], parts[1], parts[2], nil+ case 2:+ // Format: model@provider -> instance defaults to "default"+ return parts[0], "default", parts[1], nil+ case 1:+ return parts[0], "", "", fmt.Errorf("provider name missing in model name: %s", compositeName)+ }+ // len(parts) > 3: any '@' characters embedded in the leftmost modelName+ // component must be preserved in that component instead of being dropped+ // or assigned to the instance/provider fields.+ n := len(parts)+ return strings.Join(parts[:n-2], "@"), parts[n-2], parts[n-1], nil+}diff --git a/internal/entity/base.go b/internal/entity/base.goindex a92cfb443e..97bf4bc385 100644--- a/internal/entity/base.go+++ b/internal/entity/base.go@@ -122,7 +122,7 @@ func (m *BaseModel) BeforeUpdate(tx *gorm.DB) error {func (m *BaseModel) UpdateCreateDateAndTime() error {timestamp, dateTime := autoModelTime()m.CreateTime = ×tamp- m.UpdateDate = &dateTime+ m.CreateDate = &dateTimereturn nil}diff --git a/internal/ingestion/component/dispatch_model.go b/internal/ingestion/component/dispatch_model.goindex e28b6adddc..a89e790f5d 100644--- a/internal/ingestion/component/dispatch_model.go+++ b/internal/ingestion/component/dispatch_model.go@@ -24,6 +24,7 @@ import ("encoding/json""errors""fmt"+ "ragflow/internal/common""strings""ragflow/internal/dao"@@ -319,7 +320,7 @@ func resolveModelConfigByID(ctx context.Context, db *gorm.DB, tenantID string, m}func resolveModelConfigFromProviderInstance(ctx context.Context, db *gorm.DB, tenantID string, modelType entity.ModelType, modelName string) (modelModule.ModelDriver, string, *modelModule.APIConfig, int, error) {- pureModelName, instanceName, providerName, err := parseCompositeModelName(modelName)+ pureModelName, instanceName, providerName, err := common.ParseCompositeModelName(modelName)if err != nil {return nil, "", nil, 0, err}@@ -418,20 +419,6 @@ func resolveModelConfigFromProviderInstance(ctx context.Context, db *gorm.DB, tereturn driver, llmInfo.Name, apiConfig, contextLength, nil}-func parseCompositeModelName(compositeName string) (modelName, instanceName, providerName string, err error) {- parts := strings.Split(compositeName, "@")- switch len(parts) {- case 3:- return parts[0], parts[1], parts[2], nil- case 2:- return parts[0], "default", parts[1], nil- case 1:- return parts[0], "", "", fmt.Errorf("provider name missing in model name: %s", compositeName)- }- n := len(parts)- return strings.Join(parts[:n-2], "@"), parts[n-2], parts[n-1], nil-}-func newModelDriverForBaseURLLocal(driver modelModule.ModelDriver, providerName, region, baseURL string) (modelModule.ModelDriver, error) {if driver == nil {return nil, fmt.Errorf("provider %s driver not found", providerName)diff --git a/internal/ingestion/component/pdf_parser_model.go b/internal/ingestion/component/pdf_parser_model.goindex 502473450b..beaed4c973 100644--- a/internal/ingestion/component/pdf_parser_model.go+++ b/internal/ingestion/component/pdf_parser_model.go@@ -19,6 +19,7 @@ import ("encoding/json""fmt""maps"+ "ragflow/internal/common""strings""ragflow/internal/dao"@@ -56,7 +57,7 @@ func maybeDispatchTenantPDFParser(ctx context.Context, db *gorm.DB, filename strmodelName, instanceName, providerName := "", "", ""if composite {var err error- modelName, instanceName, providerName, err = parseCompositeModelName(selector)+ modelName, instanceName, providerName, err = common.ParseCompositeModelName(selector)engine = tenantPDFParserEngine(providerName)if engine == "" {return parser.ParseResult{}, false, nildiff --git a/internal/service/model_call.go b/internal/service/model_call.goindex fb38ecc4ba..c62de77b93 100644--- a/internal/service/model_call.go+++ b/internal/service/model_call.go@@ -398,7 +398,7 @@ func (s *ModelCallService) resolveModelInfo(ctx context.Context, modelRef, userIreturn nil, err}- modelName, instanceName, providerName, err := parseModelName(modelRef)+ modelName, instanceName, providerName, err := common.ParseCompositeModelName(modelRef)if err != nil {return nil, err}diff --git a/internal/service/model_factory.go b/internal/service/model_factory.goindex 7899f15b48..a9af3a4ea2 100644--- a/internal/service/model_factory.go+++ b/internal/service/model_factory.go@@ -259,43 +259,12 @@ func decodeModelInstanceExtra(raw string) (modelInstanceExtra, error) {return extra, nil}-// parseModelName parses a composite model name in format "model@instance@provider" or "model@provider"-// Returns modelName, instanceName, providerName separately.-//-// The composite key is right-anchored: providerName is always the *last*-// '@'-separated field, instanceName is the second-to-last (when present),-// and everything to the left is the bare model name. Some model names-// legitimately contain '@' characters themselves (e.g. LM Studio embedding-// model IDs such as `text-embedding-nomic-embed-text-v1.5@q8_0`), which-// produces composite keys like-// `text-embedding-nomic-embed-text-v1.5@q8_0@lmstudio@LM-Studio`. When the-// split yields more than 3 fields we rejoin the leading fields back into the-// modelName so any embedded '@' characters are preserved verbatim.-func parseModelName(compositeName string) (modelName, instanceName, providerName string, err error) {- parts := strings.Split(compositeName, "@")- switch len(parts) {- case 3:- // Format: model@instance@provider- return parts[0], parts[1], parts[2], nil- case 2:- // Format: model@provider -> instance defaults to "default"- return parts[0], "default", parts[1], nil- case 1:- return parts[0], "", "", fmt.Errorf("provider name missing in model name: %s", compositeName)- }- // len(parts) > 3: any '@' characters embedded in the leftmost modelName- // component must be preserved in that component instead of being dropped- // or assigned to the instance/provider fields.- n := len(parts)- return strings.Join(parts[:n-2], "@"), parts[n-2], parts[n-1], nil-}-// splitRightAnchoredModelName is a bare-name-tolerant variant of-// parseModelName used by the Builtin / TEI short-circuit branches in+// common.ParseCompositeModelName used by the Builtin / TEI short-circuit branches in// model resolution.//// Those branches must accept a bare model name (no provider suffix) where-// parseModelName would return an error, while still preserving any '@'+// common.ParseCompositeModelName would return an error, while still preserving any '@'// characters embedded in the modelName portion of a multi-segment key.// Returns the modelName, instanceName ("default" for the 2-segment form),// and providerName ("" for the 1-segment form).@@ -816,7 +785,7 @@ func (s *ModelFactory) resolveProviderInstanceModel(ctx context.Context, accessreturn nil, fmt.Errorf("%w: model factory is not initialized", errModelConfigUnavailable)}- pureModelName, instanceName, providerName, err := parseModelName(modelRef)+ pureModelName, instanceName, providerName, err := common.ParseCompositeModelName(modelRef)if err != nil {return nil, fmt.Errorf("%w: %v", errModelConfigUnavailable, err)}@@ -1009,7 +978,7 @@ func (s *ModelFactory) resolveCompositeModelType(ctx context.Context, access Modreturn entity.ModelTypeEmbedding, nil}}- pureModelName, instanceName, providerName, err := parseModelName(modelRef)+ pureModelName, instanceName, providerName, err := common.ParseCompositeModelName(modelRef)if err != nil {return 0, fmt.Errorf("%w: %v", errModelConfigUnavailable, err)}diff --git a/internal/service/model_service_test.go b/internal/service/model_service_test.goindex a60f6145cb..6a05c12707 100644--- a/internal/service/model_service_test.go+++ b/internal/service/model_service_test.go@@ -912,7 +912,7 @@ func TestParseModelName(t *testing.T) {for _, tt := range tests {t.Run(tt.name, func(t *testing.T) {- model, instance, provider, err := parseModelName(tt.composite)+ model, instance, provider, err := common.ParseCompositeModelName(tt.composite)if tt.wantErr {if err == nil {t.Fatalf("parseModelName(%q) error = nil, want error", tt.composite)