diff --git a/config.yml b/config.yml index f30876e..fd4b23d 100644 --- a/config.yml +++ b/config.yml @@ -1,5 +1,5 @@ server: - address: ":3005" + address: ":3009" name: "prompts-core" workerId: 1 # 雪花算法 worker ID(用于 common/db/gfdb) diff --git a/controller/prompt_controller.go b/controller/prompt_controller.go index cd34458..00a9c91 100644 --- a/controller/prompt_controller.go +++ b/controller/prompt_controller.go @@ -14,7 +14,7 @@ type prompt struct{} // Prompt 提示词配置控制器 var Prompt = new(prompt) -// ComposeMessages 调用 model-gateway 异步任务并同步等待结果 +// ComposeMessages 调用 model-gateway 异步任务并同步等待结果, func (c *prompt) ComposeMessages(ctx context.Context, req *dto.ComposeMessagesReq) (res *dto.ComposeMessagesRes, err error) { return service.Prompt.ComposeMessages(ctx, req) } @@ -58,23 +58,7 @@ func (c *prompt) GetPrompt(ctx context.Context, req *dto.GetPromptReq) (res *dto // ListPrompt 配置列表 func (c *prompt) ListPrompt(ctx context.Context, req *dto.ListPromptReq) (res *dto.ListPromptRes, err error) { - pageNum, pageSize := 1, 10 - if req != nil && req.Page != nil { - if req.Page.PageNum > 0 { - pageNum = int(req.Page.PageNum) - } - if req.Page.PageSize > 0 { - pageSize = int(req.Page.PageSize) - } - } - var modelTypeID *int - modelType := "" - if req != nil { - modelTypeID = req.ModelTypeId - modelType = req.ModelType - } - - list, total, err := service.Prompt.List(ctx, pageNum, pageSize, modelTypeID, modelType) + list, total, err := service.Prompt.List(ctx, int(req.Page.PageNum), int(req.Page.PageSize), req.ModelTypeId, req.ModelType) if err != nil { return nil, err } diff --git a/service/build_service.go b/service/build_prompt.go similarity index 99% rename from service/build_service.go rename to service/build_prompt.go index 87ac326..4a4e32d 100644 --- a/service/build_service.go +++ b/service/build_prompt.go @@ -34,7 +34,6 @@ func buildInferenceRequest(ctx context.Context, req *dto.ComposeMessagesReq, cha "role": "system", "content": promptBuild(ctx, req, model), }) - // 2. 构建历史会话提示词 for _, msg := range history { role := gconv.String(msg["role"]) diff --git a/service/compose_service.go b/service/compose_service.go index ba300cf..9fd7779 100644 --- a/service/compose_service.go +++ b/service/compose_service.go @@ -114,7 +114,9 @@ func (s *promptService) ComposeMessages(ctx context.Context, req *dto.ComposeMes if err != nil { return nil, err } + fmt.Println("构建节点前", taskRecord) message = s.parseNodeBuild(taskRecord) + fmt.Println("构建节点后", message) default: epicycleId, err = dao.ComposeSession.Insert(ctx, &entity.ComposeSession{ SessionId: req.SessionId, diff --git a/service/files_service.go b/service/files_handle.go similarity index 100% rename from service/files_service.go rename to service/files_handle.go