oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add jimeng image -- fix alpha

Browse Source
This commit is contained in:
feitianbubu
2025-07-17 21:00:55 +08:00
parent aa8d112c58
commit 0862a9bfa7
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
relay/channel/jimeng/adaptor.go
View File

@@ -12,6 +12,7 @@ import (
"one-api/relay/channel/openai" "one-api/relay/channel/openai"
relaycommon "one-api/relay/common" relaycommon "one-api/relay/common"
relayconstant "one-api/relay/constant" relayconstant "one-api/relay/constant"
"one-api/types"
) )
type Adaptor struct { type Adaptor struct {
@@ -115,13 +116,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
return resp, nil return resp, nil
} }
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *dto.OpenAIErrorWithStatusCode) { func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage any, err *types.NewAPIError) {
if info.RelayMode == relayconstant.RelayModeImagesGenerations { if info.RelayMode == relayconstant.RelayModeImagesGenerations {
err, usage = jimengImageHandler(c, resp, info) usage, err = jimengImageHandler(c, resp, info)
} else if info.IsStream { } else if info.IsStream {
err, usage = openai.OaiStreamHandler(c, resp, info) usage, err = openai.OaiStreamHandler(c, info, resp)
} else { } else {
err, usage = openai.OpenaiHandler(c, resp, info) usage, err = openai.OpenaiHandler(c, info, resp)
} }
return return
} }

32
relay/channel/jimeng/image.go
View File

@@ -3,13 +3,14 @@ package jimeng
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/gin-gonic/gin"
"io" "io"
"net/http" "net/http"
"one-api/common" "one-api/common"
"one-api/dto" "one-api/dto"
relaycommon "one-api/relay/common" relaycommon "one-api/relay/common"
"one-api/service" "one-api/types"
"github.com/gin-gonic/gin"
) )
type ImageResponse struct { type ImageResponse struct {
@@ -47,45 +48,42 @@ func responseJimeng2OpenAIImage(_ *gin.Context, response *ImageResponse, info *r
} }
// jimengImageHandler handles the Jimeng image generation response // jimengImageHandler handles the Jimeng image generation response
func jimengImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.OpenAIErrorWithStatusCode, *dto.Usage) { func jimengImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.Usage, *types.NewAPIError) {
var jimengResponse ImageResponse var jimengResponse ImageResponse
responseBody, err := io.ReadAll(resp.Body) responseBody, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return service.OpenAIErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil return nil, types.NewError(err, types.ErrorCodeReadResponseBodyFailed)
} }
common.CloseResponseBodyGracefully(resp) common.CloseResponseBodyGracefully(resp)
err = json.Unmarshal(responseBody, &jimengResponse) err = json.Unmarshal(responseBody, &jimengResponse)
if err != nil { if err != nil {
return service.OpenAIErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
} }
// Check if the response indicates an error // Check if the response indicates an error
if jimengResponse.Code != 10000 { if jimengResponse.Code != 10000 {
return &dto.OpenAIErrorWithStatusCode{ return nil, types.WithOpenAIError(types.OpenAIError{
Error: dto.OpenAIError{ Message: jimengResponse.Message,
Message: jimengResponse.Message, Type: "jimeng_error",
Type: "jimeng_error", Param: "",
Param: "", Code: fmt.Sprintf("%d", jimengResponse.Code),
Code: fmt.Sprintf("%d", jimengResponse.Code), }, resp.StatusCode)
},
StatusCode: resp.StatusCode,
}, nil
} }
// Convert Jimeng response to OpenAI format // Convert Jimeng response to OpenAI format
fullTextResponse := responseJimeng2OpenAIImage(c, &jimengResponse, info) fullTextResponse := responseJimeng2OpenAIImage(c, &jimengResponse, info)
jsonResponse, err := json.Marshal(fullTextResponse) jsonResponse, err := json.Marshal(fullTextResponse)
if err != nil { if err != nil {
return service.OpenAIErrorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
} }
c.Writer.Header().Set("Content-Type", "application/json") c.Writer.Header().Set("Content-Type", "application/json")
c.Writer.WriteHeader(resp.StatusCode) c.Writer.WriteHeader(resp.StatusCode)
_, err = c.Writer.Write(jsonResponse) _, err = c.Writer.Write(jsonResponse)
if err != nil { if err != nil {
return service.OpenAIErrorWrapper(err, "write_response_body_failed", http.StatusInternalServerError), nil return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
} }
return nil, &dto.Usage{} return &dto.Usage{}, nil
} }