Skip to content

phsl / new-api

Go to a project
Commit 1d343c79 by Calcium-Ion Committed by GitHub
Options

Merge pull request #103 from Calcium-Ion/dev 

feat: support Claude 3
parents a361c5c0 14714164
Showing with 258 additions and 74 deletions
common/image.go
...@@ -12,7 +12,7 @@ import ( ...@@ -12,7 +12,7 @@ import (
"strings" "strings"
) )
func DecodeBase64ImageData(base64String string) (image.Config, string, error) { func DecodeBase64ImageData(base64String string) (image.Config, string, string, error) {
// 去除base64数据的URL前缀（如果有） // 去除base64数据的URL前缀（如果有）
if idx := strings.Index(base64String, ","); idx != -1 { if idx := strings.Index(base64String, ","); idx != -1 {
base64String = base64String[idx+1:] base64String = base64String[idx+1:]
...@@ -22,13 +22,13 @@ func DecodeBase64ImageData(base64String string) (image.Config, string, error) { ...@@ -22,13 +22,13 @@ func DecodeBase64ImageData(base64String string) (image.Config, string, error) {
decodedData, err := base64.StdEncoding.DecodeString(base64String) decodedData, err := base64.StdEncoding.DecodeString(base64String)
if err != nil { if err != nil {
fmt.Println("Error: Failed to decode base64 string") fmt.Println("Error: Failed to decode base64 string")
return image.Config{}, "", err return image.Config{}, "", "", err
} }
// 创建一个bytes.Buffer用于存储解码后的数据 // 创建一个bytes.Buffer用于存储解码后的数据
reader := bytes.NewReader(decodedData) reader := bytes.NewReader(decodedData)
config, format, err := getImageConfig(reader) config, format, err := getImageConfig(reader)
return config, format, err return config, format, base64String, err
} }
func IsImageUrl(url string) (bool, error) { func IsImageUrl(url string) (bool, error) {
...@@ -42,6 +42,7 @@ func IsImageUrl(url string) (bool, error) { ...@@ -42,6 +42,7 @@ func IsImageUrl(url string) (bool, error) {
return true, nil return true, nil
} }
// GetImageFromUrl 获取图片的类型和base64编码的数据
func GetImageFromUrl(url string) (mimeType string, data string, err error) { func GetImageFromUrl(url string) (mimeType string, data string, err error) {
isImage, err := IsImageUrl(url) isImage, err := IsImageUrl(url)
if !isImage { if !isImage {
......
dto/text_request.go
...@@ -82,6 +82,14 @@ func (m Message) StringContent() string { ...@@ -82,6 +82,14 @@ func (m Message) StringContent() string {
return string(m.Content) return string(m.Content)
} }
func (m Message) IsStringContent() bool {
var stringContent string
if err := json.Unmarshal(m.Content, &stringContent); err == nil {
return true
}
return false
}
func (m Message) ParseContent() []MediaMessage { func (m Message) ParseContent() []MediaMessage {
var contentList []MediaMessage var contentList []MediaMessage
var stringContent string var stringContent string
...@@ -130,9 +138,3 @@ func (m Message) ParseContent() []MediaMessage { ...@@ -130,9 +138,3 @@ func (m Message) ParseContent() []MediaMessage {
return nil return nil
} }
type Usage struct {
PromptTokens int `json:"prompt_tokens"`
CompletionTokens int `json:"completion_tokens"`
TotalTokens int `json:"total_tokens"`
}
dto/text_response.go
...@@ -61,3 +61,9 @@ type CompletionsStreamResponse struct { ...@@ -61,3 +61,9 @@ type CompletionsStreamResponse struct {
FinishReason string `json:"finish_reason"` FinishReason string `json:"finish_reason"`
} `json:"choices"` } `json:"choices"`
} }
type Usage struct {
PromptTokens int `json:"prompt_tokens"`
CompletionTokens int `json:"completion_tokens"`
TotalTokens int `json:"total_tokens"`
}
relay/channel/claude/adaptor.go
...@@ -6,10 +6,10 @@ import ( ...@@ -6,10 +6,10 @@ import (
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"io" "io"
"net/http" "net/http"
"one-api/common"
"one-api/dto" "one-api/dto"
"one-api/relay/channel" "one-api/relay/channel"
relaycommon "one-api/relay/common" relaycommon "one-api/relay/common"
"one-api/service"
"strings" "strings"
) )
...@@ -50,15 +50,15 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *re ...@@ -50,15 +50,15 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *re
} }
func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *dto.GeneralOpenAIRequest) (any, error) { func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *dto.GeneralOpenAIRequest) (any, error) {
common.SysLog(fmt.Sprintf("Request mode: %d", a.RequestMode))
if request == nil { if request == nil {
return nil, errors.New("request is nil") return nil, errors.New("request is nil")
} }
//if a.RequestMode == RequestModeCompletion { if a.RequestMode == RequestModeCompletion {
// return requestOpenAI2ClaudeComplete(*request), nil return requestOpenAI2ClaudeComplete(*request), nil
//} else { } else {
// return requestOpenAI2ClaudeMessage(*request), nil return requestOpenAI2ClaudeMessage(*request)
//} }
return request, nil
} }
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) { func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) {
...@@ -67,11 +67,9 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request ...@@ -67,11 +67,9 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) { func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
if info.IsStream { if info.IsStream {
var responseText string err, usage = claudeStreamHandler(a.RequestMode, info.UpstreamModelName, info.PromptTokens, c, resp)
err, responseText = claudeStreamHandler(c, resp)
usage = service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
} else { } else {
err, usage = claudeHandler(c, resp, info.PromptTokens, info.UpstreamModelName) err, usage = claudeHandler(a.RequestMode, c, resp, info.PromptTokens, info.UpstreamModelName)
} }
return return
} }
......
relay/channel/claude/constants.go
package claude package claude
var ModelList = []string{ var ModelList = []string{
"claude-instant-1", "claude-2", "claude-2.0", "claude-2.1", "claude-instant-1", "claude-2", "claude-2.0", "claude-2.1", "claude-3-sonnet-20240229", "claude-3-opus-20240229",
} }
var ChannelName = "claude" var ChannelName = "claude"
relay/channel/claude/dto.go
...@@ -4,14 +4,36 @@ type ClaudeMetadata struct { ...@@ -4,14 +4,36 @@ type ClaudeMetadata struct {
UserId string `json:"user_id"` UserId string `json:"user_id"`
} }
type ClaudeMediaMessage struct {
Type string `json:"type"`
Text string `json:"text,omitempty"`
Source *ClaudeMessageSource `json:"source,omitempty"`
Usage *ClaudeUsage `json:"usage,omitempty"`
StopReason *string `json:"stop_reason,omitempty"`
}
type ClaudeMessageSource struct {
Type string `json:"type"`
MediaType string `json:"media_type"`
Data string `json:"data"`
}
type ClaudeMessage struct {
Role string `json:"role"`
Content any `json:"content"`
}
type ClaudeRequest struct { type ClaudeRequest struct {
Model string `json:"model"` Model string `json:"model"`
Prompt string `json:"prompt"` Prompt string `json:"prompt,omitempty"`
MaxTokensToSample uint `json:"max_tokens_to_sample"` System string `json:"system,omitempty"`
StopSequences []string `json:"stop_sequences,omitempty"` Messages []ClaudeMessage `json:"messages,omitempty"`
Temperature float64 `json:"temperature,omitempty"` MaxTokensToSample uint `json:"max_tokens_to_sample,omitempty"`
TopP float64 `json:"top_p,omitempty"` MaxTokens uint `json:"max_tokens,omitempty"`
TopK int `json:"top_k,omitempty"` StopSequences []string `json:"stop_sequences,omitempty"`
Temperature float64 `json:"temperature,omitempty"`
TopP float64 `json:"top_p,omitempty"`
TopK int `json:"top_k,omitempty"`
//ClaudeMetadata `json:"metadata,omitempty"` //ClaudeMetadata `json:"metadata,omitempty"`
Stream bool `json:"stream,omitempty"` Stream bool `json:"stream,omitempty"`
} }
...@@ -22,8 +44,25 @@ type ClaudeError struct { ...@@ -22,8 +44,25 @@ type ClaudeError struct {
} }
type ClaudeResponse struct { type ClaudeResponse struct {
Completion string `json:"completion"` Id string `json:"id"`
StopReason string `json:"stop_reason"` Type string `json:"type"`
Model string `json:"model"` Content []ClaudeMediaMessage `json:"content"`
Error ClaudeError `json:"error"` Completion string `json:"completion"`
StopReason string `json:"stop_reason"`
Model string `json:"model"`
Error ClaudeError `json:"error"`
Usage ClaudeUsage `json:"usage"`
Index int `json:"index"` // stream only
Delta *ClaudeMediaMessage `json:"delta"` // stream only
Message *ClaudeResponse `json:"message"` // stream only: message_start
}
//type ClaudeResponseChoice struct {
// Index int `json:"index"`
// Type string `json:"type"`
//}
type ClaudeUsage struct {
InputTokens int `json:"input_tokens"`
OutputTokens int `json:"output_tokens"`
} }
service/token_counter.go
...@@ -74,7 +74,7 @@ func getImageToken(imageUrl *dto.MessageImageUrl) (int, error) { ...@@ -74,7 +74,7 @@ func getImageToken(imageUrl *dto.MessageImageUrl) (int, error) {
config, format, err = common.DecodeUrlImageData(imageUrl.Url) config, format, err = common.DecodeUrlImageData(imageUrl.Url)
} else { } else {
common.SysLog(fmt.Sprintf("decoding image")) common.SysLog(fmt.Sprintf("decoding image"))
config, format, err = common.DecodeBase64ImageData(imageUrl.Url) config, format, _, err = common.DecodeBase64ImageData(imageUrl.Url)
} }
if err != nil { if err != nil {
return 0, err return 0, err
......
web/src/pages/Channel/EditChannel.js
...@@ -63,7 +63,7 @@ const EditChannel = (props) => { ...@@ -63,7 +63,7 @@ const EditChannel = (props) => {
let localModels = []; let localModels = [];
switch (value) { switch (value) {
case 14: case 14:
localModels = ['claude-instant-1', 'claude-2']; localModels = ["claude-instant-1", "claude-2", "claude-2.0", "claude-2.1", "claude-3-sonnet-20240229", "claude-3-opus-20240229"];
break; break;
case 11: case 11:
localModels = ['PaLM-2']; localModels = ['PaLM-2'];
......
web/src/pages/TopUp/index.js
...@@ -3,6 +3,8 @@ import {API, isMobile, showError, showInfo, showSuccess} from '../../helpers'; ...@@ -3,6 +3,8 @@ import {API, isMobile, showError, showInfo, showSuccess} from '../../helpers';
import {renderNumber, renderQuota} from '../../helpers/render'; import {renderNumber, renderQuota} from '../../helpers/render';
import {Col, Layout, Row, Typography, Card, Button, Form, Divider, Space, Modal} from "@douyinfe/semi-ui"; import {Col, Layout, Row, Typography, Card, Button, Form, Divider, Space, Modal} from "@douyinfe/semi-ui";
import Title from "@douyinfe/semi-ui/lib/es/typography/title"; import Title from "@douyinfe/semi-ui/lib/es/typography/title";
import Text from '@douyinfe/semi-ui/lib/es/typography/text';
import { Link } from 'react-router-dom';
const TopUp = () => { const TopUp = () => {
const [redemptionCode, setRedemptionCode] = useState(''); const [redemptionCode, setRedemptionCode] = useState('');
...@@ -290,6 +292,15 @@ const TopUp = () => { ...@@ -290,6 +292,15 @@ const TopUp = () => {
</Space> </Space>
</Form> </Form>
</div> </div>
<div style={{ display: 'flex', justifyContent: 'right' }}>
<Text>
<Link onClick={
async () => {
window.location.href = '/topup/history'
}
}>充值记录</Link>
</Text>
</div>
</Card> </Card>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment