diff --git a/consts/public/public.go b/consts/public/public.go index fcddd35..68d21a5 100644 --- a/consts/public/public.go +++ b/consts/public/public.go @@ -2,18 +2,48 @@ package public // ModelType 模型类型常量 const ( - ModelTypeInference = 1 // 推理模型 - ModelTypeImage = 2 // 图片模型 - ModelTypeAudio = 3 // 音频模型 - ModelTypeVector = 4 // 向量化模型 - ModelTypeOmni = 5 // 全模态模型 + ModelTypeInference = 100 // 推理模型 + + ModelTypeImage = 200 // 图片模型 + ImageSubTypeTextToImage = 201 // 图片模型-文生图 + ImageSubTypeImageToImage = 202 // 图片模型-图生图 + ImageSubTypeImageEdit = 203 // 图片模型-图片编辑 + ImageSubTypeImageVariation = 204 // 图片模型-图片变体 + + ModelTypeAudio = 300 // 音频模型 + AudioSubTypeTextToSpeech = 301 // 音频模型-文生音 + AudioSubTypeSpeechToText = 302 // 音频模型-音生文 + AudioSubTypeSpeechToSpeech = 303 // 音频模型-音生音 + + ModelTypeVector = 400 // 向量化模型 + VectorSubTypeEmbedding = 401 // 向量化模型-文本嵌入 + VectorSubTypeRerank = 402 // 向量化模型-重排序 + + ModelTypeOmni = 500 // 全模态模型 + OmniSubTypeTextImageAudio = 501 // 全模态模型-文图音 + OmniSubTypeVision = 502 // 全模态模型-视觉理解 ) // ModelTypeName 模型类型名称映射 var ModelTypeName = map[int]string{ ModelTypeInference: "推理模型", - ModelTypeImage: "图片模型", - ModelTypeAudio: "音频模型", - ModelTypeVector: "向量化模型", - ModelTypeOmni: "全模态模型", + + ModelTypeImage: "图片模型", + ImageSubTypeTextToImage: "图片模型-文生图", + ImageSubTypeImageToImage: "图片模型-图生图", + ImageSubTypeImageEdit: "图片模型-图片编辑", + ImageSubTypeImageVariation: "图片模型-图片变体", + + ModelTypeAudio: "音频模型", + AudioSubTypeTextToSpeech: "音频模型-文生音", + AudioSubTypeSpeechToText: "音频模型-音生文", + AudioSubTypeSpeechToSpeech: "音频模型-音生音", + + ModelTypeVector: "向量化模型", + VectorSubTypeEmbedding: "向量化模型-文本嵌入", + VectorSubTypeRerank: "向量化模型-重排序", + + ModelTypeOmni: "全模态模型", + OmniSubTypeTextImageAudio: "全模态模型-文图音", + OmniSubTypeVision: "全模态模型-视觉理解", } diff --git a/service/gateway/gateway_http_service.go b/service/gateway/gateway_http_service.go index e9edb30..d5c71ee 100644 --- a/service/gateway/gateway_http_service.go +++ b/service/gateway/gateway_http_service.go @@ -51,6 +51,7 @@ func UploadByTask(ctx context.Context, _ *entity.AsynchTask, data []byte, fileEx headers := util.ForwardHeaders(ctx) headers["Content-Type"] = contentType + //fullURL := "oss/file/uploadFile" fullURL := "oss/file/uploadFile" g.Log().Infof(ctx, "[OSS] upload start url=%s filename=%s size=%d", fullURL, filename, len(data)) diff --git a/service/model_service.go b/service/model_service.go index 5981022..2fba6af 100644 --- a/service/model_service.go +++ b/service/model_service.go @@ -231,6 +231,7 @@ func (s *modelService) Get(ctx context.Context, req *dto.GetModelReq) (*dto.GetM model.RequestMapping = util.ParseJSONField(model.RequestMapping) model.ResponseMapping = util.ParseJSONField(model.ResponseMapping) model.ResponseBody = util.ParseJSONField(model.ResponseBody) + model.TokenConfig = util.ParseJSONField(model.TokenConfig) return &dto.GetModelRes{ Model: model, }, nil @@ -266,6 +267,7 @@ func (s *modelService) List(ctx context.Context, req *dto.ListModelReq) (res *dt m.RequestMapping = util.ParseJSONField(m.RequestMapping) m.ResponseMapping = util.ParseJSONField(m.ResponseMapping) m.ResponseBody = util.ParseJSONField(m.ResponseBody) + m.TokenConfig = util.ParseJSONField(m.TokenConfig) } return &dto.ListModelRes{ List: models, @@ -345,6 +347,7 @@ func (s *modelService) GetIsChatModel(ctx context.Context) (*dto.GetIsChatModelR model.RequestMapping = util.ParseJSONField(model.RequestMapping) model.ResponseMapping = util.ParseJSONField(model.ResponseMapping) model.ResponseBody = util.ParseJSONField(model.ResponseBody) + model.TokenConfig = util.ParseJSONField(model.TokenConfig) return &dto.GetIsChatModelRes{ Model: model, }, nil