feat: Added web page for configuring model information
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -135,6 +135,10 @@ func (h *KnowledgeHandler) CreateKnowledgeFromFile(c *gin.Context) {
|
||||
if h.handleDuplicateKnowledgeError(c, err, knowledge, "file") {
|
||||
return
|
||||
}
|
||||
if appErr, ok := errors.IsAppError(err); ok {
|
||||
c.Error(appErr)
|
||||
return
|
||||
}
|
||||
logger.ErrorWithFields(ctx, err, nil)
|
||||
c.Error(errors.NewInternalServerError(err.Error()))
|
||||
return
|
||||
|
||||
+24
-24
@@ -18,11 +18,12 @@ import (
|
||||
|
||||
// SessionHandler handles all HTTP requests related to conversation sessions
|
||||
type SessionHandler struct {
|
||||
messageService interfaces.MessageService // Service for managing messages
|
||||
sessionService interfaces.SessionService // Service for managing sessions
|
||||
streamManager interfaces.StreamManager // Manager for handling streaming responses
|
||||
config *config.Config // Application configuration
|
||||
testDataService *service.TestDataService // Service for test data (models, etc.)
|
||||
messageService interfaces.MessageService // Service for managing messages
|
||||
sessionService interfaces.SessionService // Service for managing sessions
|
||||
streamManager interfaces.StreamManager // Manager for handling streaming responses
|
||||
config *config.Config // Application configuration
|
||||
testDataService *service.TestDataService // Service for test data (models, etc.)
|
||||
knowledgebaseService interfaces.KnowledgeBaseService
|
||||
}
|
||||
|
||||
// NewSessionHandler creates a new instance of SessionHandler with all necessary dependencies
|
||||
@@ -32,13 +33,15 @@ func NewSessionHandler(
|
||||
streamManager interfaces.StreamManager,
|
||||
config *config.Config,
|
||||
testDataService *service.TestDataService,
|
||||
knowledgebaseService interfaces.KnowledgeBaseService,
|
||||
) *SessionHandler {
|
||||
return &SessionHandler{
|
||||
sessionService: sessionService,
|
||||
messageService: messageService,
|
||||
streamManager: streamManager,
|
||||
config: config,
|
||||
testDataService: testDataService,
|
||||
sessionService: sessionService,
|
||||
messageService: messageService,
|
||||
streamManager: streamManager,
|
||||
config: config,
|
||||
testDataService: testDataService,
|
||||
knowledgebaseService: knowledgebaseService,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -191,27 +194,24 @@ func (h *SessionHandler) CreateSession(c *gin.Context) {
|
||||
logger.Debug(ctx, "Using default session strategy")
|
||||
}
|
||||
|
||||
// Get model IDs from test data service if not provided
|
||||
kb, err := h.knowledgebaseService.GetKnowledgeBaseByID(ctx, request.KnowledgeBaseID)
|
||||
if err != nil {
|
||||
logger.Error(ctx, "Failed to get knowledge base", err)
|
||||
c.Error(errors.NewInternalServerError(err.Error()))
|
||||
return
|
||||
}
|
||||
|
||||
// Get model IDs from knowledge base if not provided
|
||||
if createdSession.SummaryModelID == "" {
|
||||
if h.testDataService != nil {
|
||||
createdSession.SummaryModelID = h.testDataService.LLMModel.GetModelID()
|
||||
logger.Debug(ctx, "Using summary model ID from test data service")
|
||||
} else {
|
||||
logger.Error(ctx, "Summary model ID is empty and cannot get default value")
|
||||
c.Error(errors.NewBadRequestError("Summary model ID cannot be empty"))
|
||||
return
|
||||
}
|
||||
createdSession.SummaryModelID = kb.SummaryModelID
|
||||
}
|
||||
if createdSession.RerankModelID == "" {
|
||||
if h.testDataService != nil && h.testDataService.RerankModel != nil {
|
||||
createdSession.RerankModelID = h.testDataService.RerankModel.GetModelID()
|
||||
logger.Debug(ctx, "Using rerank model ID from test data service")
|
||||
}
|
||||
createdSession.RerankModelID = kb.RerankModelID
|
||||
}
|
||||
|
||||
// Call service to create session
|
||||
logger.Infof(ctx, "Calling session service to create session")
|
||||
createdSession, err := h.sessionService.CreateSession(ctx, createdSession)
|
||||
createdSession, err = h.sessionService.CreateSession(ctx, createdSession)
|
||||
if err != nil {
|
||||
logger.ErrorWithFields(ctx, err, nil)
|
||||
c.Error(errors.NewInternalServerError(err.Error()))
|
||||
|
||||
@@ -4,7 +4,6 @@ import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
@@ -65,26 +64,19 @@ func (h *TestDataHandler) GetTestData(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
tenantID := os.Getenv("INIT_TEST_TENANT_ID")
|
||||
logger.Debugf(ctx, "Test tenant ID environment variable: %s", tenantID)
|
||||
|
||||
tenantIDUint, err := strconv.ParseUint(tenantID, 10, 64)
|
||||
if err != nil {
|
||||
logger.Errorf(ctx, "Failed to parse tenant ID: %s", tenantID)
|
||||
c.Error(err)
|
||||
return
|
||||
}
|
||||
tenantID := uint(types.InitDefaultTenantID)
|
||||
logger.Debugf(ctx, "Test tenant ID environment variable: %d", tenantID)
|
||||
|
||||
// Retrieve the test tenant data
|
||||
logger.Infof(ctx, "Retrieving test tenant, ID: %d", tenantIDUint)
|
||||
tenant, err := h.tenantService.GetTenantByID(ctx, uint(tenantIDUint))
|
||||
logger.Infof(ctx, "Retrieving test tenant, ID: %d", tenantID)
|
||||
tenant, err := h.tenantService.GetTenantByID(ctx, tenantID)
|
||||
if err != nil {
|
||||
logger.ErrorWithFields(ctx, err, nil)
|
||||
c.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
knowledgeBaseID := os.Getenv("INIT_TEST_KNOWLEDGE_BASE_ID")
|
||||
knowledgeBaseID := types.InitDefaultKnowledgeBaseID
|
||||
logger.Debugf(ctx, "Test knowledge base ID environment variable: %s", knowledgeBaseID)
|
||||
|
||||
// Retrieve the test knowledge base data
|
||||
|
||||
Reference in New Issue
Block a user