diff --git a/cmd/frontend/graphqlbackend/cody_context.go b/cmd/frontend/graphqlbackend/cody_context.go index 4be9a616d73..d5670aa12d7 100644 --- a/cmd/frontend/graphqlbackend/cody_context.go +++ b/cmd/frontend/graphqlbackend/cody_context.go @@ -37,9 +37,9 @@ type RankContextArgs struct { } type RecordContextArgs struct { - InteractionID string - UsedContextItems []InputContextItem - DiscardedContextItems []InputContextItem + InteractionID string + UsedContextItems []InputContextItem + IgnoredContextItems []InputContextItem } type InputContextItem struct { @@ -96,5 +96,5 @@ func (f *FileChunkContextResolver) ChunkContent(ctx context.Context) (string, er type RankContextResolver interface { Ranker() string Used() []int32 - Discarded() []int32 + Ignored() []int32 } diff --git a/cmd/frontend/graphqlbackend/cody_context.graphql b/cmd/frontend/graphqlbackend/cody_context.graphql index 3c3d1a1e6dc..5483cc175b7 100644 --- a/cmd/frontend/graphqlbackend/cody_context.graphql +++ b/cmd/frontend/graphqlbackend/cody_context.graphql @@ -88,7 +88,7 @@ extend type Query { """ Context items that were not passed to the LLM. """ - discardedContextItems: [InputContextItem!]! + ignoredContextItems: [InputContextItem!]! ): EmptyResponse } @@ -187,7 +187,7 @@ type RankingResponse { """ used: [Int!]! """ - Indices of context items that were discarded by the ranker. Order is undefined. + Indices of context items that were ignored by the ranker. Order is undefined. """ - discarded: [Int!]! + ignored: [Int!]! } diff --git a/cmd/frontend/internal/context/resolvers/context.go b/cmd/frontend/internal/context/resolvers/context.go index e3760a9d030..d17a1b0491f 100644 --- a/cmd/frontend/internal/context/resolvers/context.go +++ b/cmd/frontend/internal/context/resolvers/context.go @@ -58,19 +58,19 @@ func (r *Resolver) RecordContext(ctx context.Context, args graphqlbackend.Record if err != nil { return nil, err } - retrieverUsed, retrieverDiscarded := map[string]int{}, map[string]int{} + retrieverUsed, retrieverIgnored := map[string]int{}, map[string]int{} for _, item := range args.UsedContextItems { retrieverUsed[item.Retriever]++ } - for _, item := range args.DiscardedContextItems { - retrieverDiscarded[item.Retriever]++ + for _, item := range args.IgnoredContextItems { + retrieverIgnored[item.Retriever]++ } - fields := []log.Field{log.String("interactionID", args.InteractionID), log.Int("includedItemCount", len(args.UsedContextItems)), log.Int("excludedItemCount", len(args.DiscardedContextItems))} + fields := []log.Field{log.String("interactionID", args.InteractionID), log.Int("usedItemCount", len(args.UsedContextItems)), log.Int("ignoredItemCount", len(args.IgnoredContextItems))} for r, cnt := range retrieverUsed { fields = append(fields, log.Int(r+"-used", cnt)) } - for r, cnt := range retrieverDiscarded { - fields = append(fields, log.Int(r+"-discarded", cnt)) + for r, cnt := range retrieverIgnored { + fields = append(fields, log.Int(r+"-ignored", cnt)) } r.logger.Info("recording context", fields...) return nil, nil @@ -315,9 +315,9 @@ func countLines(content string, numRunes int) int { } type rankContextResponse struct { - ranker string - used []int32 - discarded []int32 + ranker string + used []int32 + ignored []int32 } func (r rankContextResponse) Ranker() string { @@ -328,8 +328,8 @@ func (r rankContextResponse) Used() []int32 { return r.used } -func (r rankContextResponse) Discarded() []int32 { - return r.discarded +func (r rankContextResponse) Ignored() []int32 { + return r.ignored } var _ graphqlbackend.RankContextResolver = &rankContextResponse{}