Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ ERROR account@example.com [WAA Worker 停止 failed] WAA Worker 停止失败 p

客户端取消记录为 `499`;认证、额度和上游失败分别使用对应 HTTP 状态与 `request.error`。

管理端取消活动请求或停止生成服务时,仍连接的客户端按公开协议收到 `503 request_canceled` 或对应的流式 error event。
管理端取消活动请求时,仍连接的客户端按公开协议收到 `503 request_canceled` 或对应的流式 error event;停止生成服务时收到 `503 service_stopped` 或对应的流式 error event,错误消息写明生成服务已停止。

## 流式等待

Expand Down
6 changes: 6 additions & 0 deletions internal/aistudio/request_phase.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ func ContextWithServiceRun(ctx context.Context, run context.Context) context.Con
return context.WithValue(ctx, serviceRunContextKey{}, run)
}

// ServiceStopped 返回 ctx 所属的生成服务是否已停止,ctx 没有记下服务运行时为 false
func ServiceStopped(ctx context.Context) bool {
run, ok := ctx.Value(serviceRunContextKey{}).(context.Context)
return ok && run.Err() != nil
}

// afterServiceStop 在 ctx 所属的生成服务停止时调用 stop,服务已停止时在返回前调用,返回撤销注册的函数;ctx 没有记下服务运行时不调用
func afterServiceStop(ctx context.Context, stop func()) func() bool {
run, ok := ctx.Value(serviceRunContextKey{}).(context.Context)
Expand Down
4 changes: 3 additions & 1 deletion internal/app/bidi.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func (service *trackedService) OpenBidi(ctx context.Context, request aistudio.Bi
if request.AccountID == "" && len(request.AllowedAccountIDs) == 0 {
request.AllowedAccountIDs, err = service.bidiCandidates(requestCtx, request.Model, request.ModelAccessScope)
if err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(ctx, err)
cancel()
return nil, err
Expand Down Expand Up @@ -58,6 +59,7 @@ func (service *trackedService) OpenBidi(ctx context.Context, request aistudio.Bi
})
session, err := service.service.(aistudio.BidiService).OpenBidi(requestCtx, request)
if err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(ctx, err)
cancel()
return nil, err
Expand Down Expand Up @@ -132,7 +134,7 @@ func (service *trackedService) bidiRequestContext(ctx context.Context) (context.
service.lifecycleMu.Unlock()
return nil, nil, service.stoppedError()
}
requestCtx, cancel := context.WithCancel(ctx)
requestCtx, cancel := context.WithCancel(aistudio.ContextWithServiceRun(ctx, service.dataContext))
stopData := context.AfterFunc(service.dataContext, cancel)
context.AfterFunc(requestCtx, func() {
stopData()
Expand Down
2 changes: 2 additions & 0 deletions internal/app/embeddings.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func (service *trackedService) Embed(ctx context.Context, request aistudio.Embed
service.requests.start(aistudio.GenerateRequest{ID: request.ID, Model: request.Model}, cancel)
request.CandidateAccountIDs, err = service.embeddingCandidates(requestCtx, modelID)
if err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(requestCtx, err)
service.requests.finish(request.ID, finalRequestState(err))
return aistudio.EmbeddingResult{}, err
Expand Down Expand Up @@ -59,6 +60,7 @@ func (service *trackedService) Embed(ctx context.Context, request aistudio.Embed
service.requests.markChannel(request.ID, string(aistudio.ChannelBuild))
})
result, err := service.service.(aistudio.EmbeddingService).Embed(observed, request)
err = endedRequestError(requestCtx, err)
if err == nil {
api.SetAccessLogGenerationResult(requestCtx, &aistudio.Usage{InputTokens: result.TokenCount, TotalTokens: result.TokenCount}, 0)
}
Expand Down
5 changes: 5 additions & 0 deletions internal/app/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ func (service *trackedService) UploadFile(ctx context.Context, request aistudio.
}
defer cancel()
file, requestErr := service.service.(aistudio.FileService).UploadFile(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return file, requestErr
}
Expand All @@ -27,6 +28,7 @@ func (service *trackedService) FileMetadata(ctx context.Context, fileID string)
}
defer cancel()
metadata, requestErr := service.service.(aistudio.FileService).FileMetadata(requestCtx, fileID)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return metadata, requestErr
}
Expand All @@ -39,6 +41,7 @@ func (service *trackedService) ListFiles(ctx context.Context) ([]aistudio.FileMe
}
defer cancel()
list, requestErr := service.service.(aistudio.FileService).ListFiles(requestCtx)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return list, requestErr
}
Expand All @@ -51,6 +54,7 @@ func (service *trackedService) DeleteFile(ctx context.Context, fileID string) er
}
defer cancel()
requestErr := service.service.(aistudio.FileService).DeleteFile(requestCtx, fileID)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return requestErr
}
Expand All @@ -63,6 +67,7 @@ func (service *trackedService) VideoFrameTokens(ctx context.Context, request ais
}
defer cancel()
tokens, requestErr := service.service.(aistudio.VideoFrameService).VideoFrameTokens(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return tokens, requestErr
}
35 changes: 30 additions & 5 deletions internal/app/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,7 @@ func (service *trackedService) CountTokens(ctx context.Context, request aistudio
}
defer cancel()
count, requestErr := service.service.CountTokens(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return count, requestErr
}
Expand All @@ -1442,7 +1443,8 @@ func (service *trackedService) GenerateTitle(ctx context.Context, request aistud
return "", err
}
defer cancel()
return service.service.(aistudio.TitleService).GenerateTitle(requestCtx, request)
title, err := service.service.(aistudio.TitleService).GenerateTitle(requestCtx, request)
return title, endedRequestError(requestCtx, err)
}

// GenerateImage 生成 Imagen 图片并登记请求目标与账户
Expand All @@ -1454,6 +1456,7 @@ func (service *trackedService) GenerateImage(ctx context.Context, request aistud
}
defer cancel()
images, requestErr := service.service.(aistudio.ImageService).GenerateImage(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return images, requestErr
}
Expand All @@ -1467,6 +1470,7 @@ func (service *trackedService) CreateDecision(ctx context.Context, request aistu
}
defer cancel()
result, requestErr := service.service.(aistudio.DecisionService).CreateDecision(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
service.requests.log("service", "WARN", "Decision 请求使用 AI Studio 官网中隐藏的模型", "model", request.Model)
return result, requestErr
Expand All @@ -1484,6 +1488,7 @@ func (service *trackedService) GenerateVideo(ctx context.Context, request aistud
}
defer cancel()
if err := service.videoCooling(requestCtx, request); err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(requestCtx, err)
return aistudio.VideoOperation{}, err
}
Expand All @@ -1495,6 +1500,7 @@ func (service *trackedService) GenerateVideo(ctx context.Context, request aistud
return service.dataRequestContext(context.Background())
}
operation, requestErr := service.service.(aistudio.VideoService).GenerateVideo(requestCtx, request)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return operation, requestErr
}
Expand Down Expand Up @@ -1556,6 +1562,7 @@ func (service *trackedService) GetGenerateVideoOperation(ctx context.Context, op
}
defer cancel()
operation, requestErr := service.service.(aistudio.VideoService).GetGenerateVideoOperation(requestCtx, operationID)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return operation, requestErr
}
Expand All @@ -1568,6 +1575,7 @@ func (service *trackedService) ListVideos(ctx context.Context) ([]aistudio.Video
}
defer cancel()
videos, requestErr := service.service.(aistudio.VideoService).ListVideos(requestCtx)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return videos, requestErr
}
Expand All @@ -1580,6 +1588,7 @@ func (service *trackedService) DeleteVideo(ctx context.Context, operationID stri
}
defer cancel()
requestErr := service.service.(aistudio.VideoService).DeleteVideo(requestCtx, operationID)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
return requestErr
}
Expand All @@ -1591,24 +1600,30 @@ func (service *trackedService) DownloadFile(ctx context.Context, fileID string)
return aistudio.MediaStream{}, err
}
media, requestErr := service.service.(aistudio.VideoService).DownloadFile(requestCtx, fileID)
requestErr = endedRequestError(requestCtx, requestErr)
api.SetAccessLogError(requestCtx, requestErr)
if requestErr != nil {
cancel()
return aistudio.MediaStream{}, requestErr
}
media.Body = &trackedMediaReadCloser{body: media.Body, cancel: cancel}
media.Body = &trackedMediaReadCloser{body: media.Body, ctx: requestCtx, cancel: cancel}
return media, requestErr
}

type trackedMediaReadCloser struct {
body io.ReadCloser
ctx context.Context
cancel context.CancelFunc
once sync.Once
err error
}

func (closer *trackedMediaReadCloser) Read(target []byte) (int, error) {
return closer.body.Read(target)
read, err := closer.body.Read(target)
if err != io.EOF {
err = endedRequestError(closer.ctx, err)
}
return read, err
}

func (closer *trackedMediaReadCloser) Close() error {
Expand Down Expand Up @@ -2053,6 +2068,7 @@ func (service *trackedService) Generate(ctx context.Context, request aistudio.Ge
service.requests.start(request, cancel)
resourceID, err := service.pool.ResourceIDForContents(requestCtx, request.Contents)
if err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(requestCtx, err)
cancel()
service.requests.finish(request.ID, finalRequestState(err))
Expand Down Expand Up @@ -2386,7 +2402,7 @@ func (service *trackedService) generateWithRetry(
if activity != nil {
api.SetAccessLogUpstreamBytes(requestCtx, activity.bytes.Load())
}
err = accountsUnavailable(err, retry.rejectionUntil)
err = accountsUnavailable(endedRequestError(requestCtx, err), retry.rejectionUntil)
api.SetAccessLogError(requestCtx, err)
service.requests.finish(request.ID, finalRequestState(err))
select {
Expand Down Expand Up @@ -3015,6 +3031,14 @@ func (service *trackedService) dataRequestContext(ctx context.Context) (context.
}, nil
}

// endedRequestError 在请求所属的生成服务已停止时把非空的 err 换成生成服务已停止的错误,其余原样返回 err
func endedRequestError(ctx context.Context, err error) error {
if err != nil && aistudio.ServiceStopped(ctx) {
return &serviceStoppedError{}
}
return err
}

// roundDeadlineContext 是期限可在自动续写每轮开始时重新计时的请求上下文,到期时 Err 为 context.DeadlineExceeded
type roundDeadlineContext struct {
parent context.Context
Expand Down Expand Up @@ -3109,7 +3133,7 @@ func (service *trackedService) forwardEvents(
defer stallTimer.Stop()
var stall <-chan time.Time
finishFromContext := func() {
requestErr = requestCtx.Err()
requestErr = endedRequestError(requestCtx, requestCtx.Err())
state = finalRequestState(requestErr)
if requestErr == nil || terminal || clientCtx.Err() != nil {
return
Expand Down Expand Up @@ -3224,6 +3248,7 @@ func (service *trackedService) forwardEvents(
continue
}
if event.Kind == aistudio.EventError {
event.Err = endedRequestError(requestCtx, event.Err)
event.Err = service.settleStreamError(requestCtx, requestID, requestedModelID, serving.Load(), event.Err)
requestErr = event.Err
state = finalRequestState(event.Err)
Expand Down
2 changes: 2 additions & 0 deletions internal/app/transcriptions.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func (service *trackedService) Transcribe(
}, cancel)
request.CandidateAccountIDs, err = service.transcriptionCandidates(requestCtx, request.Model)
if err != nil {
err = endedRequestError(requestCtx, err)
api.SetAccessLogError(requestCtx, err)
service.requests.finish(request.ID, finalRequestState(err))
cancel()
Expand Down Expand Up @@ -81,6 +82,7 @@ func (service *trackedService) Transcribe(
service.requests.markRunning(request.ID, account.ID, account.Config.Label)
})
result, err := service.service.(aistudio.TranscriptionService).Transcribe(observed, request)
err = endedRequestError(requestCtx, err)
api.SetAccessLogFirstEvent(requestCtx, result.FirstEvent, 0)
api.SetAccessLogGenerationResult(
requestCtx, &result.Usage, 0,
Expand Down