mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 15:12:02 +00:00
Unify naming of used/ignored context (#63903)
Replaces the use of discarded/unused/filtered with a consistent use of ignored. ## Test plan - tested locally
This commit is contained in:
parent
f61e637062
commit
8af830a2a8
@ -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
|
||||
}
|
||||
|
||||
@ -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!]!
|
||||
}
|
||||
|
||||
@ -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{}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user