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

feat: support ollama claude format

Browse Source
This commit is contained in:
CaIon
2025-07-23 20:01:03 +08:00
parent 13bdb80958
commit ae0461692c
5 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controller/relay.go
View File

@@ -56,7 +56,7 @@ func relayHandler(c *gin.Context, relayMode int) *types.NewAPIError {
userGroup := c.GetString("group") userGroup := c.GetString("group")
channelId := c.GetInt("channel_id") channelId := c.GetInt("channel_id")
other := make(map[string]interface{}) other := make(map[string]interface{})
other["error_type"] = err.ErrorType other["error_type"] = err.GetErrorType()
other["error_code"] = err.GetErrorCode() other["error_code"] = err.GetErrorCode()
other["status_code"] = err.StatusCode other["status_code"] = err.StatusCode
other["channel_id"] = channelId other["channel_id"] = channelId

26
relay/channel/ollama/adaptor.go
View File

@@ -17,10 +17,13 @@ import (
type Adaptor struct { type Adaptor struct {
} }
func (a *Adaptor) ConvertClaudeRequest(*gin.Context, *relaycommon.RelayInfo, *dto.ClaudeRequest) (any, error) { func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) {
//TODO implement me openaiAdaptor := openai.Adaptor{}
panic("implement me") openaiRequest, err := openaiAdaptor.ConvertClaudeRequest(c, info, request)
return nil, nil if err != nil {
return nil, err
}
return requestOpenAI2Ollama(openaiRequest.(*dto.GeneralOpenAIRequest))
} }
func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) { func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
@@ -37,6 +40,9 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
} }
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if info.RelayFormat == relaycommon.RelayFormatClaude {
return info.BaseUrl + "/v1/chat/completions", nil
}
switch info.RelayMode { switch info.RelayMode {
case relayconstant.RelayModeEmbeddings: case relayconstant.RelayModeEmbeddings:
return info.BaseUrl + "/api/embed", nil return info.BaseUrl + "/api/embed", nil
@@ -55,7 +61,7 @@ func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayIn
if request == nil { if request == nil {
return nil, errors.New("request is nil") return nil, errors.New("request is nil")
} }
return requestOpenAI2Ollama(*request) return requestOpenAI2Ollama(request)
} }
func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dto.RerankRequest) (any, error) { func (a *Adaptor) ConvertRerankRequest(c *gin.Context, relayMode int, request dto.RerankRequest) (any, error) {
@@ -85,6 +91,16 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycom
usage, err = openai.OpenaiHandler(c, info, resp) usage, err = openai.OpenaiHandler(c, info, resp)
} }
} }
switch info.RelayMode {
case relayconstant.RelayModeEmbeddings:
usage, err = ollamaEmbeddingHandler(c, info, resp)
default:
if info.IsStream {
usage, err = openai.OaiStreamHandler(c, info, resp)
} else {
usage, err = openai.OpenaiHandler(c, info, resp)
}
}
return return
} }

10
relay/channel/ollama/relay-ollama.go
View File

@@ -14,7 +14,7 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
) )
func requestOpenAI2Ollama(request dto.GeneralOpenAIRequest) (*OllamaRequest, error) { func requestOpenAI2Ollama(request *dto.GeneralOpenAIRequest) (*OllamaRequest, error) {
messages := make([]dto.Message, 0, len(request.Messages)) messages := make([]dto.Message, 0, len(request.Messages))
for _, message := range request.Messages { for _, message := range request.Messages {
if !message.IsStringContent() { if !message.IsStringContent() {
@@ -92,15 +92,15 @@ func ollamaEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *h
var ollamaEmbeddingResponse OllamaEmbeddingResponse var ollamaEmbeddingResponse OllamaEmbeddingResponse
responseBody, err := io.ReadAll(resp.Body) responseBody, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, types.NewError(err, types.ErrorCodeBadResponseBody) return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
} }
common.CloseResponseBodyGracefully(resp) common.CloseResponseBodyGracefully(resp)
err = common.Unmarshal(responseBody, &ollamaEmbeddingResponse) err = common.Unmarshal(responseBody, &ollamaEmbeddingResponse)
if err != nil { if err != nil {
return nil, types.NewError(err, types.ErrorCodeBadResponseBody) return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
} }
if ollamaEmbeddingResponse.Error != "" { if ollamaEmbeddingResponse.Error != "" {
return nil, types.NewError(fmt.Errorf("ollama error: %s", ollamaEmbeddingResponse.Error), types.ErrorCodeBadResponseBody) return nil, types.NewOpenAIError(fmt.Errorf("ollama error: %s", ollamaEmbeddingResponse.Error), types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
} }
flattenedEmbeddings := flattenEmbeddings(ollamaEmbeddingResponse.Embedding) flattenedEmbeddings := flattenEmbeddings(ollamaEmbeddingResponse.Embedding)
data := make([]dto.OpenAIEmbeddingResponseItem, 0, 1) data := make([]dto.OpenAIEmbeddingResponseItem, 0, 1)
@@ -121,7 +121,7 @@ func ollamaEmbeddingHandler(c *gin.Context, info *relaycommon.RelayInfo, resp *h
} }
doResponseBody, err := common.Marshal(embeddingResponse) doResponseBody, err := common.Marshal(embeddingResponse)
if err != nil { if err != nil {
return nil, types.NewError(err, types.ErrorCodeBadResponseBody) return nil, types.NewOpenAIError(err, types.ErrorCodeBadResponseBody, http.StatusInternalServerError)
} }
common.IOCopyBytesGracefully(c, resp, doResponseBody) common.IOCopyBytesGracefully(c, resp, doResponseBody)
return usage, nil return usage, nil

8
service/error.go
View File

@@ -80,10 +80,7 @@ func ClaudeErrorWrapperLocal(err error, code string, statusCode int) *dto.Claude
} }
func RelayErrorHandler(resp *http.Response, showBodyWhenFail bool) (newApiErr *types.NewAPIError) { func RelayErrorHandler(resp *http.Response, showBodyWhenFail bool) (newApiErr *types.NewAPIError) {
newApiErr = &types.NewAPIError{ newApiErr = types.InitOpenAIError(types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
StatusCode: resp.StatusCode,
ErrorType: types.ErrorTypeOpenAIError,
}
responseBody, err := io.ReadAll(resp.Body) responseBody, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
@@ -105,8 +102,7 @@ func RelayErrorHandler(resp *http.Response, showBodyWhenFail bool) (newApiErr *t
// General format error (OpenAI, Anthropic, Gemini, etc.) // General format error (OpenAI, Anthropic, Gemini, etc.)
newApiErr = types.WithOpenAIError(errResponse.Error, resp.StatusCode) newApiErr = types.WithOpenAIError(errResponse.Error, resp.StatusCode)
} else { } else {
newApiErr = types.NewErrorWithStatusCode(errors.New(errResponse.ToMessage()), types.ErrorCodeBadResponseStatusCode, resp.StatusCode) newApiErr = types.NewOpenAIError(errors.New(errResponse.ToMessage()), types.ErrorCodeBadResponseStatusCode, resp.StatusCode)
newApiErr.ErrorType = types.ErrorTypeOpenAIError
} }
return return
} }

34
types/error.go
View File

@@ -75,7 +75,7 @@ const (
type NewAPIError struct { type NewAPIError struct {
Err error Err error
RelayError any RelayError any
ErrorType ErrorType errorType ErrorType
errorCode ErrorCode errorCode ErrorCode
StatusCode int StatusCode int
} }
@@ -87,6 +87,13 @@ func (e *NewAPIError) GetErrorCode() ErrorCode {
return e.errorCode return e.errorCode
} }
func (e *NewAPIError) GetErrorType() ErrorType {
if e == nil {
return ""
}
return e.errorType
}
func (e *NewAPIError) Error() string { func (e *NewAPIError) Error() string {
if e == nil { if e == nil {
return "" return ""
@@ -103,7 +110,7 @@ func (e *NewAPIError) SetMessage(message string) {
} }
func (e *NewAPIError) ToOpenAIError() OpenAIError { func (e *NewAPIError) ToOpenAIError() OpenAIError {
switch e.ErrorType { switch e.errorType {
case ErrorTypeOpenAIError: case ErrorTypeOpenAIError:
if openAIError, ok := e.RelayError.(OpenAIError); ok { if openAIError, ok := e.RelayError.(OpenAIError); ok {
return openAIError return openAIError
@@ -120,14 +127,14 @@ func (e *NewAPIError) ToOpenAIError() OpenAIError {
} }
return OpenAIError{ return OpenAIError{
Message: e.Error(), Message: e.Error(),
Type: string(e.ErrorType), Type: string(e.errorType),
Param: "", Param: "",
Code: e.errorCode, Code: e.errorCode,
} }
} }
func (e *NewAPIError) ToClaudeError() ClaudeError { func (e *NewAPIError) ToClaudeError() ClaudeError {
switch e.ErrorType { switch e.errorType {
case ErrorTypeOpenAIError: case ErrorTypeOpenAIError:
openAIError := e.RelayError.(OpenAIError) openAIError := e.RelayError.(OpenAIError)
return ClaudeError{ return ClaudeError{
@@ -139,7 +146,7 @@ func (e *NewAPIError) ToClaudeError() ClaudeError {
default: default:
return ClaudeError{ return ClaudeError{
Message: e.Error(), Message: e.Error(),
Type: string(e.ErrorType), Type: string(e.errorType),
} }
} }
} }
@@ -148,7 +155,7 @@ func NewError(err error, errorCode ErrorCode) *NewAPIError {
return &NewAPIError{ return &NewAPIError{
Err: err, Err: err,
RelayError: nil, RelayError: nil,
ErrorType: ErrorTypeNewAPIError, errorType: ErrorTypeNewAPIError,
StatusCode: http.StatusInternalServerError, StatusCode: http.StatusInternalServerError,
errorCode: errorCode, errorCode: errorCode,
} }
@@ -162,6 +169,13 @@ func NewOpenAIError(err error, errorCode ErrorCode, statusCode int) *NewAPIError
return WithOpenAIError(openaiError, statusCode) return WithOpenAIError(openaiError, statusCode)
} }
func InitOpenAIError(errorCode ErrorCode, statusCode int) *NewAPIError {
openaiError := OpenAIError{
Type: string(errorCode),
}
return WithOpenAIError(openaiError, statusCode)
}
func NewErrorWithStatusCode(err error, errorCode ErrorCode, statusCode int) *NewAPIError { func NewErrorWithStatusCode(err error, errorCode ErrorCode, statusCode int) *NewAPIError {
return &NewAPIError{ return &NewAPIError{
Err: err, Err: err,
@@ -169,7 +183,7 @@ func NewErrorWithStatusCode(err error, errorCode ErrorCode, statusCode int) *New
Message: err.Error(), Message: err.Error(),
Type: string(errorCode), Type: string(errorCode),
}, },
ErrorType: ErrorTypeNewAPIError, errorType: ErrorTypeNewAPIError,
StatusCode: statusCode, StatusCode: statusCode,
errorCode: errorCode, errorCode: errorCode,
} }
@@ -182,7 +196,7 @@ func WithOpenAIError(openAIError OpenAIError, statusCode int) *NewAPIError {
} }
return &NewAPIError{ return &NewAPIError{
RelayError: openAIError, RelayError: openAIError,
ErrorType: ErrorTypeOpenAIError, errorType: ErrorTypeOpenAIError,
StatusCode: statusCode, StatusCode: statusCode,
Err: errors.New(openAIError.Message), Err: errors.New(openAIError.Message),
errorCode: ErrorCode(code), errorCode: ErrorCode(code),
@@ -192,7 +206,7 @@ func WithOpenAIError(openAIError OpenAIError, statusCode int) *NewAPIError {
func WithClaudeError(claudeError ClaudeError, statusCode int) *NewAPIError { func WithClaudeError(claudeError ClaudeError, statusCode int) *NewAPIError {
return &NewAPIError{ return &NewAPIError{
RelayError: claudeError, RelayError: claudeError,
ErrorType: ErrorTypeClaudeError, errorType: ErrorTypeClaudeError,
StatusCode: statusCode, StatusCode: statusCode,
Err: errors.New(claudeError.Message), Err: errors.New(claudeError.Message),
errorCode: ErrorCode(claudeError.Type), errorCode: ErrorCode(claudeError.Type),
@@ -211,5 +225,5 @@ func IsLocalError(err *NewAPIError) bool {
return false return false
} }
return err.ErrorType == ErrorTypeNewAPIError return err.errorType == ErrorTypeNewAPIError
} }