mirror of
https://github.com/QuantumNous/new-api.git
synced 2026-05-03 18:04:37 +00:00
refactor(relay): rename RelayTask to RelayTaskFetch and update routing
- Renamed RelayTask function to RelayTaskFetch for clarity. - Updated routing in relay-router.go and video-router.go to use RelayTaskFetch for fetch operations. - Enhanced error handling in RelayTaskFetch function. - Adjusted task data conversion in TaskAdaptor to include task ID.
This commit is contained in:
@@ -450,6 +450,21 @@ func RelayNotFound(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func RelayTaskFetch(c *gin.Context) {
|
||||||
|
relayInfo, err := relaycommon.GenRelayInfo(c, types.RelayFormatTask, nil, nil)
|
||||||
|
if err != nil {
|
||||||
|
c.JSON(http.StatusInternalServerError, &dto.TaskError{
|
||||||
|
Code: "gen_relay_info_failed",
|
||||||
|
Message: err.Error(),
|
||||||
|
StatusCode: http.StatusInternalServerError,
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if taskErr := relay.RelayTaskFetch(c, relayInfo.RelayMode); taskErr != nil {
|
||||||
|
respondTaskError(c, taskErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func RelayTask(c *gin.Context) {
|
func RelayTask(c *gin.Context) {
|
||||||
relayInfo, err := relaycommon.GenRelayInfo(c, types.RelayFormatTask, nil, nil)
|
relayInfo, err := relaycommon.GenRelayInfo(c, types.RelayFormatTask, nil, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -461,17 +476,6 @@ func RelayTask(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fetch 路径:纯 DB 查询,不依赖上下文 channel,无需重试
|
|
||||||
switch relayInfo.RelayMode {
|
|
||||||
case relayconstant.RelayModeSunoFetch, relayconstant.RelayModeSunoFetchByID, relayconstant.RelayModeVideoFetchByID:
|
|
||||||
if taskErr := relay.RelayTaskFetch(c, relayInfo.RelayMode); taskErr != nil {
|
|
||||||
respondTaskError(c, taskErr)
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// ── Submit 路径 ─────────────────────────────────────────────────
|
|
||||||
|
|
||||||
if taskErr := relay.ResolveOriginTask(c, relayInfo); taskErr != nil {
|
if taskErr := relay.ResolveOriginTask(c, relayInfo); taskErr != nil {
|
||||||
respondTaskError(c, taskErr)
|
respondTaskError(c, taskErr)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import (
|
|||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
"github.com/tidwall/sjson"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ============================
|
// ============================
|
||||||
@@ -250,5 +251,10 @@ func (a *TaskAdaptor) ParseTaskResult(respBody []byte) (*relaycommon.TaskInfo, e
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *TaskAdaptor) ConvertToOpenAIVideo(task *model.Task) ([]byte, error) {
|
func (a *TaskAdaptor) ConvertToOpenAIVideo(task *model.Task) ([]byte, error) {
|
||||||
return task.Data, nil
|
data := task.Data
|
||||||
|
var err error
|
||||||
|
if data, err = sjson.SetBytes(data, "id", task.TaskID); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "set id failed")
|
||||||
|
}
|
||||||
|
return data, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,8 +174,8 @@ func SetRelayRouter(router *gin.Engine) {
|
|||||||
relaySunoRouter.Use(middleware.TokenAuth(), middleware.Distribute())
|
relaySunoRouter.Use(middleware.TokenAuth(), middleware.Distribute())
|
||||||
{
|
{
|
||||||
relaySunoRouter.POST("/submit/:action", controller.RelayTask)
|
relaySunoRouter.POST("/submit/:action", controller.RelayTask)
|
||||||
relaySunoRouter.POST("/fetch", controller.RelayTask)
|
relaySunoRouter.POST("/fetch", controller.RelayTaskFetch)
|
||||||
relaySunoRouter.GET("/fetch/:id", controller.RelayTask)
|
relaySunoRouter.GET("/fetch/:id", controller.RelayTaskFetch)
|
||||||
}
|
}
|
||||||
|
|
||||||
relayGeminiRouter := router.Group("/v1beta")
|
relayGeminiRouter := router.Group("/v1beta")
|
||||||
|
|||||||
@@ -19,14 +19,14 @@ func SetVideoRouter(router *gin.Engine) {
|
|||||||
videoV1Router.Use(middleware.TokenAuth(), middleware.Distribute())
|
videoV1Router.Use(middleware.TokenAuth(), middleware.Distribute())
|
||||||
{
|
{
|
||||||
videoV1Router.POST("/video/generations", controller.RelayTask)
|
videoV1Router.POST("/video/generations", controller.RelayTask)
|
||||||
videoV1Router.GET("/video/generations/:task_id", controller.RelayTask)
|
videoV1Router.GET("/video/generations/:task_id", controller.RelayTaskFetch)
|
||||||
videoV1Router.POST("/videos/:video_id/remix", controller.RelayTask)
|
videoV1Router.POST("/videos/:video_id/remix", controller.RelayTask)
|
||||||
}
|
}
|
||||||
// openai compatible API video routes
|
// openai compatible API video routes
|
||||||
// docs: https://platform.openai.com/docs/api-reference/videos/create
|
// docs: https://platform.openai.com/docs/api-reference/videos/create
|
||||||
{
|
{
|
||||||
videoV1Router.POST("/videos", controller.RelayTask)
|
videoV1Router.POST("/videos", controller.RelayTask)
|
||||||
videoV1Router.GET("/videos/:task_id", controller.RelayTask)
|
videoV1Router.GET("/videos/:task_id", controller.RelayTaskFetch)
|
||||||
}
|
}
|
||||||
|
|
||||||
klingV1Router := router.Group("/kling/v1")
|
klingV1Router := router.Group("/kling/v1")
|
||||||
@@ -34,8 +34,8 @@ func SetVideoRouter(router *gin.Engine) {
|
|||||||
{
|
{
|
||||||
klingV1Router.POST("/videos/text2video", controller.RelayTask)
|
klingV1Router.POST("/videos/text2video", controller.RelayTask)
|
||||||
klingV1Router.POST("/videos/image2video", controller.RelayTask)
|
klingV1Router.POST("/videos/image2video", controller.RelayTask)
|
||||||
klingV1Router.GET("/videos/text2video/:task_id", controller.RelayTask)
|
klingV1Router.GET("/videos/text2video/:task_id", controller.RelayTaskFetch)
|
||||||
klingV1Router.GET("/videos/image2video/:task_id", controller.RelayTask)
|
klingV1Router.GET("/videos/image2video/:task_id", controller.RelayTaskFetch)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Jimeng official API routes - direct mapping to official API format
|
// Jimeng official API routes - direct mapping to official API format
|
||||||
|
|||||||
Reference in New Issue
Block a user