Feat(ingestion): align image to MinIO upload, unify chunk-id computation and add PPT parsing support (#17111)

## Summary

Align the Go ingestion pipeline with Python's `image` → `img_id`
persistence semantics, and unify the chunk-id computation across all
paths.

### Changes

**1. Image upload at chunker stage **

- Add `ImageUploader` type and `DefaultImageUploader` in
`internal/ingestion/component/image_uploader.go` — the write-side
counterpart to `FetchBinary`, storing raw image bytes at `(bucket=kbID,
key=chunkID)`, no re-encoding.
- Add `uploadOneImage` — pure upload primitive (bytes in, `img_id` out),
does not touch chunk maps.
- Add `uploadChunkImages` / `uploadChunkImage` — caller-side helper:
decodes `image` from a chunk, uploads bytes, writes `ck["img_id"]`,
`delete(ck,"image")` , bounded by a process-wide semaphore (default 10,
env `MAX_CONCURRENT_MINIO`).
- Wire via `imageUploadDecorator` in `register.go`: every chunker runs
the upload pass at invocation time, writing `ck["id"]` before upload and
dropping image bytes right after — peak memory = single chunk image
lifetime.

**2. Unify chunk-id computation**

- Consolidate three separate id-computation paths (`component.ChunkID`,
`task.ChunkID`, inline `FormatUint` in API) into one:
`common.ChunkID(docID, text string)`, using `%016x` +
`xxhash.Sum64String(text+docID)` (matching Python `hexdigest()`).
- The chunker decorator writes `ck["id"]` via `common.ChunkID`; the
persist stage (`ProcessChunksForPipeline`) falls back to the same
function (`if !exists id`).
- The API AddChunk path now also calls `common.ChunkID` instead of the
divergent `FormatUint(xxhash.Sum64(...))` — fixing a pre-existing
inconsistency.
- Delete `internal/ingestion/component/chunk_id.go` and
`internal/ingestion/task/chunk_builder.go` (both were pure forwarding
shells).

**3. Preserve `img_id` (never deleted)**

- `img_id` is a persistent index field (Infinity, OB) and the only
consumer-side reference for image retrieval; it is NEVER removed from
the chunk map. Only `image` (raw data URL) is dropped after upload.

**4. PPT parser support**
Previously PPT parsing failed. Add support to parse.

### Key design decisions

| Decision | Choice |
|----------|--------|
| Upload timing | Chunker stage (not persist), so image bytes are
dropped immediately — bounds peak memory to one chunk image |
| Upload concurrency | Process-wide semaphore, default 10 (matches
Python `minio_limiter`), env `MAX_CONCURRENT_MINIO` |
| Image encoding | Store as-is, no JPEG re-encoding (unlike Python) |
| `img_id` format | `"<kb_id>-<chunk_id>"` — matches Python
task_executor path |
| id function | Single `common.ChunkID(docID, text)`, concatenation
`text+docID` inside hash (matching Python) |
| `removeInternalChunkFields` | Retains `delete(ck,"image")` as
defensive fallback for non-chunker paths |

### Files touched

| File | Change |
|------|--------|
| `internal/common/format.go` | Add `ChunkID(docID, text)` |
| `internal/common/format_test.go` | Add ChunkID golden-value test |
| `internal/ingestion/component/image_uploader.go` | Add `ImageUploader`
type + `DefaultImageUploader` |
| `internal/ingestion/component/chunker/image_upload.go` | Add
`uploadOneImage`, `uploadChunkImages`, `uploadChunkImage`,
`decodeChunkImage`, semaphore |
| `internal/ingestion/component/chunker/image_upload_test.go` | Tests:
upload/drop, skip, no-image, concurrency, missing-id error |
| `internal/ingestion/component/chunker/register.go` | Add
`imageUploadDecorator` (writes `ck["id"]`, runs upload) |
| `internal/ingestion/task/chunk_process.go` | Use `common.ChunkID` for
persist fallback |
| `internal/service/chunk/chunk.go` | Use `common.ChunkID` instead of
`FormatUint` |
| `internal/ingestion/component/chunk_id.go` | **Deleted** (moved to
`common`) |
| `internal/ingestion/task/chunk_builder.go` | **Deleted** (shell, no
callers left) |
| `internal/ingestion/task/chunk_builder_test.go` | **Deleted** (test
migrated to `common/format_test.go`) |

### Verification

```
bash build.sh --test ./internal/service/chunk/... ./internal/common/... ./internal/ingestion/component/... ./internal/ingestion/task/...
→ ok   service/chunk / common / component / chunker / schema / task
```
This commit is contained in:
Jack
2026-07-20 19:33:51 +08:00
committed by GitHub
parent 33765c1a64
commit 2f7c2eb53c
14 changed files with 642 additions and 105 deletions

View File

@@ -24,6 +24,8 @@ import (
"strconv"
"strings"
"time"
"github.com/cespare/xxhash/v2"
)
// PtrString formats a pointer value as a string for debug/log output.
@@ -159,3 +161,17 @@ func IsValidString(v interface{}) bool {
str, ok := v.(string)
return ok && str != ""
}
// ChunkID generates a deterministic chunk identifier matching Python's:
//
// xxhash.xxh64((content_with_weight + str(doc_id)).encode("utf-8", "surrogatepass")).hexdigest()
//
// The concatenation inside the hash is text+docID (matching Python); the
// parameter order is (docID, text) so the scope/identity argument comes first.
// This is the single shared implementation used by the ingestion pipeline (for
// image object keys and index document ids) and by the API (for directly
// created chunks), so the two paths always produce the same id from the same
// (docID, text) pair.
func ChunkID(docID, text string) string {
return fmt.Sprintf("%016x", xxhash.Sum64String(text+docID))
}

View File

@@ -37,3 +37,19 @@ func TestPtrString_Bool(t *testing.T) {
t.Errorf("PtrString(&true) = %q, want true", got)
}
}
func TestChunkID_NotPanic(t *testing.T) {
_ = ChunkID("", "")
_ = ChunkID("doc-1", "content")
}
func TestChunkID_PreservesLeadingZero(t *testing.T) {
got := ChunkID("doc-1", "")
want := "037fe13bd80c56aa"
if got != want {
t.Fatalf("ChunkID(%q, %q) = %q, want %q", "doc-1", "", got, want)
}
if len(got) != 16 {
t.Fatalf("ChunkID length = %d, want 16", len(got))
}
}

View File

@@ -0,0 +1,143 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// Chunk image upload: at the moment a chunk's raw image is produced, upload it
// to object storage, record the img_id reference, and drop the in-memory bytes.
// This bounds peak memory to a single chunk's image lifetime instead
// of carrying every image across the component boundary, matching the
// pdfcrop_cgo sliding-window philosophy. Mirrors Python image2id +
// upload_to_minio (rag/utils/base64_image.py, rag/svr/task_executor.py).
package chunker
import (
"context"
"encoding/base64"
"fmt"
"os"
"strconv"
"strings"
"ragflow/internal/ingestion/component"
"ragflow/internal/ingestion/component/globals"
)
// imageUploadSem caps concurrent object-storage uploads process-wide. Default
// 10, matching Python's minio_limiter (MAX_CONCURRENT_MINIO, see
// rag/svr/task_executor_limiter.py:22). Overridable via the same env var.
var imageUploadSem = make(chan struct{}, imageUploadConcurrency())
// ChunkImageUploader is the uploader used by the chunker's image-upload pass
// (the imageUploadDecorator). It defaults to component.DefaultImageUploader;
// tests and specialized runtimes override it (e.g. with a no-op uploader).
var ChunkImageUploader component.ImageUploader = component.DefaultImageUploader
func imageUploadConcurrency() int {
if v := os.Getenv("MAX_CONCURRENT_MINIO"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
return n
}
}
return 10
}
// uploadChunkImages is the caller-side image-upload pass for a chunker's
// output. For each chunk it mirrors Python's upload_to_minio + image2id,
// running at the chunker stage (not in the Tokenizer) so the bytes are
// dropped as soon as they are produced:
// - img_id already set → keep it, skip upload (Python bypass).
// - no image → img_id="", nothing to upload.
// - otherwise → decode the image, upload the bytes via
// uploadOneImage at key=ck["id"], set img_id="<kb_id>-<chunk_id>", and
// delete the raw image field (用完即弃).
//
// The caller (imageUploadDecorator) must write ck["id"] before calling this
// function. uploadChunkImage errors when a chunk arrives without id.
func uploadChunkImages(ctx context.Context, chunks []map[string]any, up component.ImageUploader, kbID string) error {
for _, ck := range chunks {
if err := uploadChunkImage(ctx, ck, up, kbID); err != nil {
return err
}
}
return nil
}
// uploadChunkImage handles a single chunk map: reads ck["id"] (required),
// decodes and uploads the image, then writes img_id and removes the raw image.
func uploadChunkImage(ctx context.Context, ck map[string]any, up component.ImageUploader, kbID string) error {
if ck == nil {
return nil
}
chunkID, _ := ck["id"].(string)
if chunkID == "" {
return fmt.Errorf("uploadChunkImage: chunk missing id")
}
if imgID, _ := ck["img_id"].(string); imgID != "" {
return nil
}
img, _ := ck["image"].(string)
if img == "" {
ck["img_id"] = ""
return nil
}
data, err := decodeChunkImage(img)
if err != nil {
return err
}
imgID, err := uploadOneImage(ctx, up, kbID, chunkID, data)
if err != nil {
return err
}
ck["img_id"] = imgID
delete(ck, "image")
return nil
}
// uploadOneImage is the pure upload primitive: it stores already-decoded image
// bytes at (bucket=kbID, key=chunkID) and returns the img_id reference
// "<kb_id>-<chunk_id>". It does NOT read or mutate any chunk map — the caller
// is responsible for decoding the bytes, writing img_id/id, and dropping the
// raw image field. The process-wide semaphore bounds concurrent uploads.
func uploadOneImage(ctx context.Context, up component.ImageUploader, kbID, chunkID string, data []byte) (string, error) {
select {
case imageUploadSem <- struct{}{}:
defer func() { <-imageUploadSem }()
case <-ctx.Done():
return "", ctx.Err()
}
return up(ctx, kbID, chunkID, data)
}
// decodeChunkImage strips an optional data-URL prefix and base64-decodes the
// payload. Chunker image payloads are "data:image/...;base64,<b64>" (pdfcrop,
// markdown, docx). A bare base64 string is also accepted.
func decodeChunkImage(s string) ([]byte, error) {
if i := strings.Index(s, ";base64,"); i >= 0 {
s = s[i+len(";base64,"):]
} else if strings.HasPrefix(s, "data:") {
if i := strings.IndexByte(s, ','); i >= 0 {
s = s[i+1:]
}
}
return base64.StdEncoding.DecodeString(s)
}
// resolveImageUploadContext pulls kb_id / doc_id from the run-level globals,
// mirroring how other chunkers read shared metadata (e.g. `name`).
func resolveImageUploadContext(ctx context.Context, inputs map[string]any) (kbID, docID string) {
kbID = globals.GlobalOrInput(ctx, inputs, "kb_id", "")
docID = globals.GlobalOrInput(ctx, inputs, "doc_id", "")
return kbID, docID
}

View File

@@ -0,0 +1,278 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, or express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package chunker
import (
"context"
"encoding/base64"
"fmt"
"sync"
"sync/atomic"
"testing"
"time"
"ragflow/internal/common"
)
const (
testKBID = "kb-1"
testDocID = "doc-1"
)
// pngBase64 is a tiny 1x1 PNG payload (raw base64, no data-URL prefix).
const pngBase64 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="
// TestUploadOneImage_UploadsBytes pins the pure upload contract: it receives
// already-decoded bytes (not the raw chunk image field) plus the chunkID, and
// returns the img_id — it does NOT touch any chunk map.
func TestUploadOneImage_UploadsBytes(t *testing.T) {
var gotBucket, gotKey string
var gotData []byte
up := func(_ context.Context, kbID, chunkID string, data []byte) (string, error) {
gotBucket, gotKey, gotData = kbID, chunkID, data
return fmt.Sprintf("%s-%s", kbID, chunkID), nil
}
chunkID := common.ChunkID(testDocID, "caption")
data, _ := base64.StdEncoding.DecodeString(pngBase64)
imgID, err := uploadOneImage(context.Background(), up, testKBID, chunkID, data)
if err != nil {
t.Fatalf("uploadOneImage: %v", err)
}
if imgID != testKBID+"-"+chunkID {
t.Errorf("img_id = %q, want %q", imgID, testKBID+"-"+chunkID)
}
if gotBucket != testKBID || gotKey != chunkID {
t.Errorf("upload target = (%q,%q), want (%q,%q)", gotBucket, gotKey, testKBID, chunkID)
}
if string(gotData) != string(data) {
t.Errorf("uploaded bytes mismatch")
}
}
// TestUploadChunkImages_WritesImgIDAndDropsImage pins the caller-side contract:
// uploadChunkImages reads ck["id"] (already written by the decorator prior to
// calling upload), decodes the chunk's image, uploads via uploadOneImage, then
// writes ck["img_id"] and deletes the raw image field.
func TestUploadChunkImages_WritesImgIDAndDropsImage(t *testing.T) {
var gotKey string
up := func(_ context.Context, kbID, chunkID string, _ []byte) (string, error) {
gotKey = chunkID
return kbID + "-" + chunkID, nil
}
chunkID := common.ChunkID(testDocID, "caption")
ck := map[string]any{"id": chunkID, "content_with_weight": "caption", "image": "data:image/png;base64," + pngBase64}
if err := uploadChunkImages(context.Background(), []map[string]any{ck}, up, testKBID); err != nil {
t.Fatalf("uploadChunkImages: %v", err)
}
wantImgID := testKBID + "-" + chunkID
if ck["img_id"] != wantImgID {
t.Errorf("img_id = %v, want %q", ck["img_id"], wantImgID)
}
if ck["id"] != chunkID {
t.Errorf("id = %v, want %q", ck["id"], chunkID)
}
if _, ok := ck["image"]; ok {
t.Errorf("image field not deleted: %v", ck["image"])
}
if gotKey != chunkID {
t.Errorf("upload key = %q, want %q", gotKey, chunkID)
}
}
// TestUploadChunkImages_SkipsWhenImgIDPresent mirrors Python's
// `if d.get("img_id"): return` bypass — a chunk that already carries an
// img_id is left untouched and no upload happens.
func TestUploadChunkImages_SkipsWhenImgIDPresent(t *testing.T) {
called := false
up := func(_ context.Context, kbID, chunkID string, _ []byte) (string, error) {
called = true
return "should-not-be-used", nil
}
chunkID := common.ChunkID(testDocID, "x")
ck := map[string]any{"id": chunkID, "content_with_weight": "x", "img_id": "preset-img", "image": "data:image/png;base64," + pngBase64}
if err := uploadChunkImages(context.Background(), []map[string]any{ck}, up, testKBID); err != nil {
t.Fatalf("uploadChunkImages: %v", err)
}
if called {
t.Error("uploader was called; expected skip when img_id preset")
}
if ck["img_id"] != "preset-img" {
t.Errorf("img_id = %v, want preserved %q", ck["img_id"], "preset-img")
}
if ck["id"] != chunkID {
t.Errorf("id = %v, want preserved %q", ck["id"], chunkID)
}
}
// TestUploadChunkImages_NoImage: a chunk with no image gets img_id="" and no
// upload (Python: img_id="" branch). The id is preserved.
func TestUploadChunkImages_NoImage(t *testing.T) {
called := false
up := func(_ context.Context, _, _ string, _ []byte) (string, error) {
called = true
return "", nil
}
chunkID := common.ChunkID(testDocID, "text only")
ck := map[string]any{"id": chunkID, "content_with_weight": "text only"}
if err := uploadChunkImages(context.Background(), []map[string]any{ck}, up, testKBID); err != nil {
t.Fatalf("uploadChunkImages: %v", err)
}
if called {
t.Error("uploader was called for a chunk without image")
}
if ck["img_id"] != "" {
t.Errorf("img_id = %v, want empty", ck["img_id"])
}
if ck["id"] != chunkID {
t.Errorf("id = %v, want preserved %q", ck["id"], chunkID)
}
}
// TestUploadChunkImage_ErrorOnMissingID verifies that uploadChunkImage errors
// when ck["id"] is absent — the caller (decorator) must always set id first.
func TestUploadChunkImage_ErrorOnMissingID(t *testing.T) {
up := func(_ context.Context, _, _ string, _ []byte) (string, error) {
return "should-not-be-called", nil
}
ck := map[string]any{"content_with_weight": "x", "image": "data:image/png;base64," + pngBase64}
err := uploadChunkImages(context.Background(), []map[string]any{ck}, up, testKBID)
if err == nil {
t.Fatal("expected error when chunk missing id")
}
}
// TestUploadOneImage_ConcurrencyLimit verifies the process-wide semaphore caps
// concurrent uploads at the configured limit.
func TestUploadOneImage_ConcurrencyLimit(t *testing.T) {
const limit = 3
setImageUploadConcurrencyForTest(t, limit)
var inflight, maxSeen int64
release := make(chan struct{})
up := func(_ context.Context, kbID, chunkID string, _ []byte) (string, error) {
cur := atomic.AddInt64(&inflight, 1)
for {
m := atomic.LoadInt64(&maxSeen)
if cur <= m || atomic.CompareAndSwapInt64(&maxSeen, m, cur) {
break
}
}
<-release
atomic.AddInt64(&inflight, -1)
return fmt.Sprintf("%s-%s", kbID, chunkID), nil
}
const n = 12
var wg sync.WaitGroup
for i := 0; i < n; i++ {
wg.Add(1)
go func(i int) {
defer wg.Done()
data, _ := base64.StdEncoding.DecodeString(pngBase64)
chunkID := common.ChunkID(testDocID, fmt.Sprintf("c%d", i))
_, _ = uploadOneImage(context.Background(), up, testKBID, chunkID, data)
}(i)
}
waitForInflight(t, &inflight, limit)
close(release)
wg.Wait()
if maxSeen > limit {
t.Errorf("max concurrent uploads = %d, want <= %d", maxSeen, limit)
}
if maxSeen < limit {
t.Errorf("max concurrent uploads = %d, expected to reach limit %d", maxSeen, limit)
}
}
// TestImageUploadDecorator_EndToEnd drives a real OneChunker through the
// registration decorator and asserts the produced chunk was uploaded (img_id
// and id set, image dropped). Uses the ChunkImageUploader override seam so no
// real storage backend is needed.
func TestImageUploadDecorator_EndToEnd(t *testing.T) {
var gotKB, gotKey string
prev := ChunkImageUploader
ChunkImageUploader = func(_ context.Context, kbID, chunkID string, _ []byte) (string, error) {
gotKB, gotKey = kbID, chunkID
return kbID + "-" + chunkID, nil
}
t.Cleanup(func() { ChunkImageUploader = prev })
comp, err := NewOneChunker(nil)
if err != nil {
t.Fatalf("NewOneChunker: %v", err)
}
decorated := &imageUploadDecorator{inner: comp}
inputs := map[string]any{
"name": "doc.pdf",
"kb_id": testKBID,
"doc_id": testDocID,
"chunks": []map[string]any{
{"content_with_weight": "a cropped figure", "image": "data:image/png;base64," + pngBase64},
},
}
out, err := decorated.Invoke(context.Background(), inputs)
if err != nil {
t.Fatalf("decorated Invoke: %v", err)
}
chunks, ok := out["chunks"].([]map[string]any)
if !ok || len(chunks) == 0 {
t.Fatalf("no chunks in output")
}
ck := chunks[0]
wantChunkID := common.ChunkID(testDocID, "a cropped figure")
if ck["img_id"] != testKBID+"-"+wantChunkID {
t.Errorf("img_id = %v, want %q", ck["img_id"], testKBID+"-"+wantChunkID)
}
if ck["id"] != wantChunkID {
t.Errorf("id = %v, want chunk id %q written back", ck["id"], wantChunkID)
}
if _, ok := ck["image"]; ok {
t.Errorf("image not dropped: %v", ck["image"])
}
if gotKB != testKBID || gotKey != wantChunkID {
t.Errorf("upload target = (%q,%q), want (%q,%q)", gotKB, gotKey, testKBID, wantChunkID)
}
}
// setImageUploadConcurrencyForTest swaps the process-wide upload semaphore to
// `n` slots for the duration of the test, restoring the original after.
func setImageUploadConcurrencyForTest(t *testing.T, n int) {
t.Helper()
prev := imageUploadSem
imageUploadSem = make(chan struct{}, n)
t.Cleanup(func() { imageUploadSem = prev })
}
// waitForInflight blocks until the atomic counter reaches `target` or fails.
func waitForInflight(t *testing.T, counter *int64, target int64) {
t.Helper()
deadline := time.After(2 * time.Second)
for {
if atomic.LoadInt64(counter) >= target {
return
}
select {
case <-deadline:
t.Fatalf("timed out waiting for %d inflight uploads (got %d)", target, atomic.LoadInt64(counter))
case <-time.After(time.Millisecond):
}
}
}

View File

@@ -26,7 +26,10 @@
package chunker
import (
"context"
"ragflow/internal/agent/runtime"
"ragflow/internal/common"
)
// MustRegisterChunker registers a single chunker component under
@@ -41,10 +44,7 @@ func MustRegisterChunker(name string) {
if err != nil {
return nil, err
}
// newChunkerByName returns runtime.Component directly (each
// NewXxxChunker constructor satisfies the interface, so no
// intermediate type assertion is needed).
return comp, nil
return &imageUploadDecorator{inner: comp}, nil
}
runtime.MustRegister(name, runtime.CategoryIngestion, factory, runtime.Metadata{
Version: "1.0.0",
@@ -53,6 +53,39 @@ func MustRegisterChunker(name string) {
})
}
// imageUploadDecorator wraps a chunker component. Before upload it writes
// ck["id"] (the single source of chunk identity) for every chunk; then it runs
// uploadChunkImages which reads ck["id"] and uploads any raw image bytes.
type imageUploadDecorator struct {
inner runtime.Component
}
func (d *imageUploadDecorator) Invoke(ctx context.Context, inputs map[string]any) (map[string]any, error) {
out, err := d.inner.Invoke(ctx, inputs)
if err != nil {
return nil, err
}
chunks, ok := out["chunks"].([]map[string]any)
if !ok || len(chunks) == 0 {
return out, nil
}
kbID, docID := resolveImageUploadContext(ctx, inputs)
// Compute and write the deterministic chunk id (component.ChunkID) for
// every chunk. This happens here — before any upload — so uploadChunkImage
// can read ck["id"] without deriving it itself. Downstream, the persist
// stage reuses the same formula as a fallback when ck["id"] is absent.
for _, ck := range chunks {
text, _ := ck["text"].(string)
ck["id"] = common.ChunkID(docID, text)
}
if err := uploadChunkImages(ctx, chunks, ChunkImageUploader, kbID); err != nil {
return nil, err
}
return out, nil
}
// ChunkerInputs is the static, registered input descriptor shared
// by all four chunker variants.
var ChunkerInputs = map[string]string{

View File

@@ -0,0 +1,44 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package component
import (
"context"
"fmt"
)
// ImageUploader stores a chunk's raw image bytes and returns the img_id
// reference to persist in the index. It is the write-side counterpart to
// FetchBinary: injected into the chunker so the chunker can upload cropped /
// extracted images on the spot and drop the bytes, instead of carrying them
// across the component boundary.
type ImageUploader func(ctx context.Context, kbID, chunkID string, data []byte) (imgID string, err error)
// DefaultImageUploader stores image bytes at (bucket=kbID, key=chunkID) and
// returns img_id "<kb_id>-<chunk_id>". Mirrors Python image2id's storage_put +
// f"{bucket}-{objname}" (rag/utils/base64_image.py:80-82), minus re-encoding:
// the bytes are stored in whatever format the chunker produced.
func DefaultImageUploader(_ context.Context, kbID, chunkID string, data []byte) (string, error) {
stg := resolveStorage()
if stg == nil {
return "", fmt.Errorf("no storage backend registered")
}
if err := stg.Put(kbID, chunkID, data); err != nil {
return "", fmt.Errorf("store chunk image (%q,%q): %w", kbID, chunkID, err)
}
return kbID + "-" + chunkID, nil
}

View File

@@ -1,30 +0,0 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package task
import (
"fmt"
"github.com/cespare/xxhash/v2"
)
// ChunkID generates a deterministic chunk identifier matching Python's:
//
// xxhash.xxh64((content_with_weight + str(doc_id)).encode("utf-8", "surrogatepass")).hexdigest()
func ChunkID(contentWithWeight, docID string) string {
return fmt.Sprintf("%016x", xxhash.Sum64String(contentWithWeight+docID))
}

View File

@@ -1,46 +0,0 @@
//
// Copyright 2026 The InfiniFlow Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
package task
import (
"testing"
)
const (
testDocID = "doc-1"
)
func TestChunkID_NotPanic(t *testing.T) {
// Edge cases: empty content
_ = ChunkID("", testDocID)
_ = ChunkID("content", "")
_ = ChunkID("", "")
// All should not panic
}
func TestChunkID_PreservesLeadingZero(t *testing.T) {
content := ""
docID := "doc-1"
got := ChunkID(content, docID)
want := "037fe13bd80c56aa"
if got != want {
t.Fatalf("ChunkID(%q, %q) = %q, want %q", content, docID, got, want)
}
if len(got) != 16 {
t.Fatalf("ChunkID length = %d, want 16", len(got))
}
}

View File

@@ -83,11 +83,8 @@ func ProcessChunksForPipeline(
ck["create_timestamp_flt"] = timestamp
if _, exists := ck["id"]; !exists {
text, err := GetChunkTextString(ck)
if err != nil {
return nil, fmt.Errorf("process chunks for pipeline: doc=%s: %w", docID, err)
}
ck["id"] = ChunkID(text, docID)
text, _ := ck["text"].(string)
ck["id"] = common.ChunkID(docID, text)
}
cleanupConsumedChunkFields(ck)

View File

@@ -110,11 +110,19 @@ func TestProcessChunksForPipeline_GeneratesID(t *testing.T) {
}
}
func TestProcessChunksForPipeline_ReturnsErrorOnNonStringText(t *testing.T) {
// TestProcessChunksForPipeline_GeneratesIDOnNonStringText pins the id fallback:
// when ck["id"] is absent and ck["text"] is a non-string (e.g. from a
// malformed input), the type assertion silently yields "" and
// component.ChunkID computes a valid id from empty text, rather than erroring.
func TestProcessChunksForPipeline_GeneratesIDOnNonStringText(t *testing.T) {
chunks := []map[string]any{{"text": []any{"bad-shape"}}}
_, err := ProcessChunksForPipeline(chunks, "doc-1", "kb-1", "test-doc.pdf", time.Now())
if err == nil {
t.Fatal("expected error when chunk text is not a string (upstream contract violation)")
if err != nil {
t.Fatalf("ProcessChunksForPipeline: %v", err)
}
id, ok := chunks[0]["id"].(string)
if !ok || id == "" {
t.Errorf("id should be generated even for non-string text, got %v", chunks[0]["id"])
}
}

View File

@@ -29,13 +29,10 @@ func (p *PPTParser) String() string {
}
// ParseWithResult delegates to PPTXParser's structured output
// for the legacy PPT format. The two file families differ only
// in the binary container; the python parser.py:slides branch
// treats them uniformly.
// for the legacy PPT format using the "ppt" container format
// hint (OLE binary). The two file families differ only in the
// binary container; the python parser.py:slides branch treats
// them uniformly.
func (p *PPTParser) ParseWithResult(filename string, data []byte) ParseResult {
res := NewPPTXParser().ParseWithResult(filename, data)
if res.File != nil {
res.File["format"] = "ppt"
}
return res
return (&PPTXParser{format: "ppt"}).ParseWithResult(filename, data)
}

View File

@@ -0,0 +1,76 @@
//go:build cgo
package parser
import (
"testing"
officeOxide "github.com/yfedoseev/office_oxide/go"
)
// TestPPTXParser_FormatField verifies the format field wiring:
// NewPPTXParser() defaults to "pptx", and an explicit "ppt" can be set.
func TestPPTXParser_FormatField(t *testing.T) {
p := NewPPTXParser()
if p.format != "pptx" {
t.Errorf("NewPPTXParser().format = %q, want %q", p.format, "pptx")
}
p2 := &PPTXParser{format: "ppt"}
if p2.format != "ppt" {
t.Errorf("explicit PPTXParser{format: \"ppt\"}.format = %q, want %q", p2.format, "ppt")
}
}
// TestPPTXParser_ParseWithResult_CGO verifies that PPTXParser can
// parse a programmatically generated PPTX document into per-slide
// JSON items. Uses office_oxide's own PptxWriter to produce the
// test data so no external file is needed.
func TestPPTXParser_ParseWithResult_CGO(t *testing.T) {
p := NewPPTXParser()
data := buildPPTX(t, "Hello World")
res := p.ParseWithResult("test.pptx", data)
if res.Err != nil {
t.Fatalf("ParseWithResult: %v", res.Err)
}
if res.OutputFormat != "json" {
t.Errorf("OutputFormat = %q, want %q", res.OutputFormat, "json")
}
if got := res.File["format"]; got != "pptx" {
t.Errorf("File[format] = %v, want %q", got, "pptx")
}
if len(res.JSON) == 0 {
t.Fatal("JSON items is empty; expected at least one slide")
}
}
// TestPPTParser_ParseWithResult_CGO verifies that PPTParser
// delegates correctly to PPTXParser{format:"ppt"} and produces
// output with File["format"] = "ppt".
func TestPPTParser_ParseWithResult_CGO(t *testing.T) {
p := NewPPTParser()
// Use PPTX content — office_oxide may reject it with format="ppt"
// hint (expects OLE binary). When it does, skip gracefully; when
// it succeeds, verify the metadata contract.
data := buildPPTX(t, "Hello")
res := p.ParseWithResult("test.ppt", data)
if res.Err != nil {
t.Skip("PPTParser with PPTX data (expected maybe to fail):", res.Err)
}
if got := res.File["format"]; got != "ppt" {
t.Errorf("File[format] = %v, want %q", got, "ppt")
}
}
// buildPPTX creates a minimal valid PPTX document with one slide
// containing the given text, using office_oxide's PptxWriter.
func buildPPTX(t *testing.T, text string) []byte {
t.Helper()
w := officeOxide.NewPptxWriter()
slide := w.AddSlide()
w.SetSlideTitle(slide, text)
data, err := w.ToBytes()
if err != nil {
t.Fatalf("PptxWriter.ToBytes: %v", err)
}
return data
}

View File

@@ -25,10 +25,17 @@ import (
officeOxide "github.com/yfedoseev/office_oxide/go"
)
type PPTXParser struct{}
// PPTXParser parses both .pptx (OOXML) and .ppt (OLE binary)
// files via the office_oxide backend. The format field controls
// the container format passed to OpenFromBytes — "pptx" for
// ZIP-based OOXML presentations and "ppt" for the legacy binary
// OLE format.
type PPTXParser struct {
format string
}
func NewPPTXParser() *PPTXParser {
return &PPTXParser{}
return &PPTXParser{format: "pptx"}
}
func (p *PPTXParser) String() string {
@@ -39,9 +46,9 @@ func (p *PPTXParser) String() string {
// plain text. Mirrors the python parser.py:slides branch which
// forces output_format="json" for the slide family.
func (p *PPTXParser) ParseWithResult(filename string, data []byte) ParseResult {
doc, err := officeOxide.OpenFromBytes(data, "pptx")
doc, err := officeOxide.OpenFromBytes(data, p.format)
if err != nil {
return ParseResult{Err: fmt.Errorf("pptx open: %w", err)}
return ParseResult{Err: fmt.Errorf("presentation open: %w", err)}
}
defer doc.Close()
@@ -51,7 +58,7 @@ func (p *PPTXParser) ParseWithResult(filename string, data []byte) ParseResult {
}
// Split on form-feed (the python TxtParser convention used by
// ragflow's slide parser) — each block becomes a JSON item.
// RAGFlow's slide parser) — each block becomes a JSON item.
var items []map[string]any
for i, raw := range strings.Split(text, "\f") {
trimmed := strings.TrimSpace(raw)
@@ -70,7 +77,7 @@ func (p *PPTXParser) ParseWithResult(filename string, data []byte) ParseResult {
return ParseResult{
OutputFormat: "json",
File: map[string]any{"name": filename, "format": "pptx"},
File: map[string]any{"name": filename, "format": p.format},
JSON: items,
}
}

View File

@@ -29,7 +29,6 @@ import (
"ragflow/internal/common"
"ragflow/internal/entity"
"ragflow/internal/entity/models"
"strconv"
"strings"
"sync"
"time"
@@ -37,7 +36,6 @@ import (
_ "image/gif"
_ "image/png"
"github.com/cespare/xxhash/v2"
"go.uber.org/zap"
"gorm.io/gorm"
@@ -1281,7 +1279,7 @@ func (s *ChunkService) AddChunk(req *service.AddChunkRequest, userID string) (*s
}
}
chunkID := strconv.FormatUint(xxhash.Sum64([]byte(req.Content+req.DocumentID)), 16)
chunkID := common.ChunkID(req.DocumentID, req.Content)
indexName := fmt.Sprintf("ragflow_%s", kb.TenantID)
contentLtks, err := s.tokenize(req.Content)
if err != nil {