Skip to content

Commit 55e9c98

Browse files
committed
refactor(artifact): adopt AIP-122 resource name fields from protobufs (#1154)
**Because** - The artifact protobufs were updated to replace `*_id` fields with resource names per AIP-122 conventions - The instillartifact component code was using the old field names which caused compilation failures **This commit** - Updates `task_get_chunks_metadata.go` to use `OriginalFile` instead of `OriginalFileId` - Updates `task_search_chunks.go` to use the new protobuf field names: - `KnowledgeBaseId` → `KnowledgeBase` - `FileIds` → `Files` - `GetOriginalFileId()` → `GetOriginalFile()`
1 parent 9cd910c commit 55e9c98

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/h2non/filetype v1.1.3
4646
github.com/iancoleman/strcase v0.3.0
4747
github.com/influxdata/influxdb-client-go/v2 v2.14.0
48-
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260123103957-11ef6f2e9e29
48+
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260125053435-9764054668e5
4949
github.com/instill-ai/x v0.10.1-alpha.0.20260122090555-bea4f728b22c
5050
github.com/itchyny/gojq v0.12.17
5151
github.com/jackc/pgx/v5 v5.7.6

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,10 +513,8 @@ github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjw
513513
github.com/influxdata/influxdb-client-go/v2 v2.14.0/go.mod h1:Ahpm3QXKMJslpXl3IftVLVezreAUtBOTZssDrjZEFHI=
514514
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf h1:7JTmneyiNEwVBOHSjoMxiWAqB992atOeepeFYegn5RU=
515515
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
516-
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260123095600-8301099dd1c6 h1:fKp8GDVqygI7YyoT+ARvQfK0+a8PQnLLaoTO/UlrMTc=
517-
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260123095600-8301099dd1c6/go.mod h1:bCnBosofpaUxKBuTTJM3/I3thAK37kvfBnKByjnLsl4=
518-
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260123103957-11ef6f2e9e29 h1:38w3XGTfCAiZdLO9YXQEfP9Bj9GntOhuV9UO5LjAeuk=
519-
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260123103957-11ef6f2e9e29/go.mod h1:bCnBosofpaUxKBuTTJM3/I3thAK37kvfBnKByjnLsl4=
516+
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260125053435-9764054668e5 h1:h906XIcqIf8OlZoQfl9dD4UIvDt/vRlSkuTtCii/5CE=
517+
github.com/instill-ai/protogen-go v0.3.3-alpha.0.20260125053435-9764054668e5/go.mod h1:bCnBosofpaUxKBuTTJM3/I3thAK37kvfBnKByjnLsl4=
520518
github.com/instill-ai/x v0.10.1-alpha.0.20260122090555-bea4f728b22c h1:9Z3NbM6Elzh1zlOGc7PKNP52vQPuM3pwxuj2Zsoh+aE=
521519
github.com/instill-ai/x v0.10.1-alpha.0.20260122090555-bea4f728b22c/go.mod h1:/xG0LMh43kyyK9jXGtV/JGd5p9GVcreSZ6GRGVbALEU=
522520
github.com/itchyny/gojq v0.12.17 h1:8av8eGduDb5+rvEdaOO+zQUjA04MS0m3Ps8HiD+fceg=

pkg/component/data/instillartifact/v0/main_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func Test_getChunksMetadata(t *testing.T) {
135135
Seconds: 1,
136136
Nanos: 1,
137137
},
138-
OriginalFileId: "fakeFileID",
138+
OriginalFile: "fakeFileID",
139139
},
140140
},
141141
}, nil)
@@ -276,8 +276,8 @@ func Test_searchChunks(t *testing.T) {
276276

277277
clientMock.SearchChunksMock.
278278
Expect(minimock.AnyContext, &artifactpb.SearchChunksRequest{
279-
Parent: "namespaces/fakeNs",
280-
KnowledgeBaseId: "fakeID",
279+
Parent: "namespaces/fakeNs",
280+
KnowledgeBase: "fakeID",
281281
TextPrompt: "fakePrompt",
282282
TopK: 1,
283283
}).
@@ -290,7 +290,7 @@ func Test_searchChunks(t *testing.T) {
290290
TextContent: "fakeContent",
291291
File: "namespaces/fakeNs/files/fakeFileID",
292292
ChunkMetadata: &artifactpb.Chunk{
293-
OriginalFileId: fileUID.String(),
293+
OriginalFile: fileUID.String(),
294294
MarkdownReference: &artifactpb.Chunk_Reference{
295295
Start: pageTwo,
296296
End: pageTwo,

pkg/component/data/instillartifact/v0/task_get_chunks_metadata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func (e *execution) getChunksMetadata(input *structpb.Struct) (*structpb.Struct,
4747
EndPosition: 0, // deprecated field
4848
TokenCount: chunkPB.Tokens,
4949
CreateTime: chunkPB.CreateTime.AsTime().Format(time.RFC3339),
50-
OriginalFileUID: chunkPB.OriginalFileId,
50+
OriginalFileUID: chunkPB.OriginalFile,
5151
})
5252
}
5353

pkg/component/data/instillartifact/v0/task_search_chunks.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ func (e *execution) searchChunks(input *structpb.Struct) (*structpb.Struct, erro
5656
}
5757

5858
req := &artifactpb.SearchChunksRequest{
59-
Parent: fmt.Sprintf("namespaces/%s", inputStruct.Namespace),
60-
KnowledgeBaseId: inputStruct.KnowledgeBaseID,
59+
Parent: fmt.Sprintf("namespaces/%s", inputStruct.Namespace),
60+
KnowledgeBase: inputStruct.KnowledgeBaseID,
6161
TextPrompt: inputStruct.TextPrompt,
6262
TopK: inputStruct.TopK,
6363
FileMediaType: fileMediaType,
@@ -80,7 +80,7 @@ func (e *execution) searchChunks(input *structpb.Struct) (*structpb.Struct, erro
8080
}
8181

8282
if len(fileUIDs) > 0 {
83-
req.FileIds = fileUIDs
83+
req.Files = fileUIDs
8484
}
8585

8686
searchRes, err := artifactClient.SearchChunks(ctx, req)
@@ -100,7 +100,7 @@ func (e *execution) searchChunks(input *structpb.Struct) (*structpb.Struct, erro
100100
SimilarityScore: chunkPB.GetSimilarityScore(),
101101
TextContent: chunkPB.GetTextContent(),
102102
SourceFileName: chunkPB.GetFile(),
103-
SourceFileUID: chunkPB.GetChunkMetadata().GetOriginalFileId(),
103+
SourceFileUID: chunkPB.GetChunkMetadata().GetOriginalFile(),
104104
ContentType: chunkPB.GetChunkMetadata().GetType().String(),
105105
}
106106

0 commit comments

Comments
 (0)