diff --git a/ai-chat-service/chat-server/server/app.go b/ai-chat-service/chat-server/server/app.go index 06e95fa..297d87d 100644 --- a/ai-chat-service/chat-server/server/app.go +++ b/ai-chat-service/chat-server/server/app.go @@ -157,6 +157,10 @@ func (a *app) countMessageTokens(role, content string) (int, error) { return tokenizer.GetTokens(&message, a.openaiConf.Model) } +func (a *app) buildZeroUsage() *proto.Usage { + return &proto.Usage{} +} + func (a *app) buildUsage(promptTokens int, answer string) (*proto.Usage, error) { completionTokens := 0 if answer != "" { diff --git a/ai-chat-service/chat-server/server/server.go b/ai-chat-service/chat-server/server/server.go index c4a3d44..46311ae 100644 --- a/ai-chat-service/chat-server/server/server.go +++ b/ai-chat-service/chat-server/server/server.go @@ -83,12 +83,7 @@ func (s *chatService) ChatCompletion(ctx context.Context, in *proto.ChatCompleti questionEmbedding, cachedRecord := s.searchCachedAnswer(ctx, in.Message) if cachedRecord != nil { res := app.buildChatCompletionResponse(cachedRecord.Answer) - usage, tokenErr := app.buildUsage(currTokens, cachedRecord.Answer) - if tokenErr != nil { - s.log.Error(tokenErr) - } else { - res.Usage = usage - } + res.Usage = app.buildZeroUsage() res.Source = replySourceSemanticMatch return res, nil } @@ -194,12 +189,7 @@ func (s *chatService) ChatCompletionStream(in *proto.ChatCompletionRequest, stre } final := app.buildChatCompletionStreamResponse(cachedRecord.ID, "", "stop") final.Source = replySourceSemanticMatch - usage, tokenErr := app.buildUsage(currTokens, cachedRecord.Answer) - if tokenErr != nil { - s.log.Error(tokenErr) - } else { - final.Usage = usage - } + final.Usage = app.buildZeroUsage() return stream.Send(final) } diff --git a/ai-chat-stack/compose.yaml b/ai-chat-stack/compose.yaml index 633431f..8205301 100644 --- a/ai-chat-stack/compose.yaml +++ b/ai-chat-stack/compose.yaml @@ -13,18 +13,18 @@ services: - FAISS_DIM=1024 - APP_PORT=8000 - redis: - image: redis:7-alpine - container_name: ai-chat-redis - command: - - redis-server - - --save - - "" - - --appendonly - - "no" - ports: - - "8888:6379" - restart: unless-stopped + # redis: + # image: redis:7-alpine + # container_name: ai-chat-redis + # command: + # - redis-server + # - --save + # - "" + # - --appendonly + # - "no" + # ports: + # - "8888:6379" + # restart: unless-stopped tokenizer: build: diff --git a/ai-chat-stack/configs/ai-chat-service.yaml b/ai-chat-stack/configs/ai-chat-service.yaml index 2361c76..09919f7 100644 --- a/ai-chat-stack/configs/ai-chat-service.yaml +++ b/ai-chat-stack/configs/ai-chat-service.yaml @@ -17,8 +17,8 @@ chat: bot_desc: "你是一个AI助手,我需要你模拟一名资深的软件工程师来回答我的问题" min_response_tokens: 600 redis: - host: "redis" - port: 6379 + host: "127.0.0.1" + port: 8888 pwd: "" dependOn: sensitive: