admin/MonkeyCode
1
0
Fork 0
mirror of https://github.com/chaitin/MonkeyCode.git synced 2026-02-05 08:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from yokowu/chore-proxy-metadata

Browse Source 
chore: modify proxy metadata fields
This commit is contained in:
Yoko
2025-06-27 15:01:22 +08:00
committed by GitHub
parent e8c69bbee6 86bd149d7f
commit 0a0e4fe1b6
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/Makefile
View File

@@ -1,8 +1,8 @@
PLATFORM=linux/amd64
TAG=main
OUTPUT=type=docker,dest=/tmp/monkeycode_server.tar
GOCACHE=$HOME/.cache/go-build
GOMODCACHE=$HOME/go/pkg/mod
OUTPUT=type=docker,dest=${HOME}/tmp/monkeycode_server.tar
GOCACHE=${HOME}/.cache/go-build
GOMODCACHE=${HOME}/go/pkg/mod
REGISTRY=monkeycode.chaitin.cn/monkeycode
# make build PLATFORM= TAG= OUTPUT= GOCACHE=

2
backend/domain/openai.go
View File

@@ -63,7 +63,7 @@ func (m *ModelData) From(e *db.Model) *ModelData {
type ConfigReq struct {
Key string
Type consts.ConfigType `json:"type"`
Type consts.ConfigType `json:"type" query:"type"`
}
type ConfigResp struct {

23
backend/internal/proxy/proxy.go
View File

@@ -529,6 +529,15 @@ func streamRead(ctx context.Context, r io.Reader, fn func([]byte) error) error {
}
}
func getPrompt(req *openai.ChatCompletionRequest) string {
for _, message := range req.Messages {
if message.Role == "user" && strings.Contains(message.Content, "<task>") {
return message.Content
}
}
return ""
}
func (p *LLMProxy) handleChatCompletionStream(ctx context.Context, w http.ResponseWriter, req *openai.ChatCompletionRequest) {
endpoint := "/chat/completions"
p.handle(ctx, func(c *Ctx, log *RequestResponseLog) error {
@@ -543,8 +552,8 @@ func (p *LLMProxy) handleChatCompletionStream(ctx context.Context, w http.Respon
return err
}
prompt := req.Metadata["message"]
workMode := req.Metadata["work_mode"]
prompt := getPrompt(req)
mode := req.Metadata["mode"]
taskID := req.Metadata["task_id"]
// 构造上游API URL
@@ -588,7 +597,7 @@ func (p *LLMProxy) handleChatCompletionStream(ctx context.Context, w http.Respon
"modelName", m.ModelName,
"modelType", consts.ModelTypeLLM,
"apiBase", m.APIBase,
"work_mode", workMode,
"work_mode", mode,
"requestHeader", req.Header,
"requestBody", req,
"taskID", taskID,
@@ -666,7 +675,7 @@ func (p *LLMProxy) handleChatCompletionStream(ctx context.Context, w http.Respon
UserID: c.UserID,
ModelID: m.ID,
ModelType: consts.ModelTypeLLM,
WorkMode: workMode,
WorkMode: mode,
Prompt: prompt,
TaskID: taskID,
}
@@ -746,8 +755,8 @@ func (p *LLMProxy) handleChatCompletion(ctx context.Context, w http.ResponseWrit
}
startTime := time.Now()
prompt := req.Metadata["message"]
workMode := req.Metadata["work_mode"]
prompt := getPrompt(req)
mode := req.Metadata["mode"]
taskID := req.Metadata["task_id"]
client := request.NewClient(u.Scheme, u.Host, 30*time.Second)
@@ -775,7 +784,7 @@ func (p *LLMProxy) handleChatCompletion(ctx context.Context, w http.ResponseWrit
TaskID: taskID,
UserID: c.UserID,
Prompt: prompt,
WorkMode: workMode,
WorkMode: mode,
ModelID: m.ID,
ModelType: m.ModelType,
InputTokens: int64(resp.Usage.PromptTokens),