chenchenandClaude Opus 4.6
f43aa269d6
- Replace all encoding/json direct calls with common.Marshal/Unmarshal/DecodeJson per Rule 1 - Fix Dify nil pointer dereference on remote image upload (relay-dify.go) - Fix Claude relay file content type detection for text/* and PDF (relay-claude.go) - Fix unsafe type assertions in Claude relay and Vertex GetModelRegion - Fix StreamScanner unconditionally resetting pre-existing StreamStatus - Add inferMimeTypeFromFilename() for proper MIME type handling in DTO - Fix Mac build script hardcoded DMG version (now reads from tauri.conf.json) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
91 lines
2.7 KiB
Go
91 lines
2.7 KiB
Go
package jimeng
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/heicode/manager/common"
|
|
"github.com/heicode/manager/dto"
|
|
relaycommon "github.com/heicode/manager/relay/common"
|
|
"github.com/heicode/manager/service"
|
|
"github.com/heicode/manager/types"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
type ImageResponse struct {
|
|
Code int `json:"code"`
|
|
Message string `json:"message"`
|
|
Data struct {
|
|
BinaryDataBase64 []string `json:"binary_data_base64"`
|
|
ImageUrls []string `json:"image_urls"`
|
|
RephraseResult string `json:"rephraser_result"`
|
|
RequestID string `json:"request_id"`
|
|
// Other fields are omitted for brevity
|
|
} `json:"data"`
|
|
RequestID string `json:"request_id"`
|
|
Status int `json:"status"`
|
|
TimeElapsed string `json:"time_elapsed"`
|
|
}
|
|
|
|
func responseJimeng2OpenAIImage(_ *gin.Context, response *ImageResponse, info *relaycommon.RelayInfo) *dto.ImageResponse {
|
|
imageResponse := dto.ImageResponse{
|
|
Created: info.StartTime.Unix(),
|
|
}
|
|
|
|
for _, base64Data := range response.Data.BinaryDataBase64 {
|
|
imageResponse.Data = append(imageResponse.Data, dto.ImageData{
|
|
B64Json: base64Data,
|
|
})
|
|
}
|
|
for _, imageUrl := range response.Data.ImageUrls {
|
|
imageResponse.Data = append(imageResponse.Data, dto.ImageData{
|
|
Url: imageUrl,
|
|
})
|
|
}
|
|
|
|
return &imageResponse
|
|
}
|
|
|
|
// jimengImageHandler handles the Jimeng image generation response
|
|
func jimengImageHandler(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (*dto.Usage, *types.NewAPIError) {
|
|
var jimengResponse ImageResponse
|
|
responseBody, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeReadResponseBodyFailed, http.StatusInternalServerError)
|
|
}
|
|
service.CloseResponseBodyGracefully(resp)
|
|
|
|
err = common.Unmarshal(responseBody, &jimengResponse)
|
|
if err != nil {
|
|
return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
|
|
}
|
|
|
|
// Check if the response indicates an error
|
|
if jimengResponse.Code != 10000 {
|
|
return nil, types.WithOpenAIError(types.OpenAIError{
|
|
Message: jimengResponse.Message,
|
|
Type: "jimeng_error",
|
|
Param: "",
|
|
Code: fmt.Sprintf("%d", jimengResponse.Code),
|
|
}, resp.StatusCode)
|
|
}
|
|
|
|
// Convert Jimeng response to OpenAI format
|
|
fullTextResponse := responseJimeng2OpenAIImage(c, &jimengResponse, info)
|
|
jsonResponse, err := common.Marshal(fullTextResponse)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
|
|
c.Writer.Header().Set("Content-Type", "application/json")
|
|
c.Writer.WriteHeader(resp.StatusCode)
|
|
_, err = c.Writer.Write(jsonResponse)
|
|
if err != nil {
|
|
return nil, types.NewError(err, types.ErrorCodeBadResponseBody)
|
|
}
|
|
|
|
return &dto.Usage{}, nil
|
|
}
|