Align Go ingestion boundaries with Python (#16647)

Moves doc_id blob resolution into Parser, tightens chunker/tokenizer to
Python output_format semantics, updates extractor list handling, and
fixes real-template integration tests.
This commit is contained in:
Zhichang Yu
2026-07-05 20:43:52 +08:00
committed by GitHub
parent 0fcfb38365
commit 014c3f634f
119 changed files with 18083 additions and 4712 deletions

View File

@@ -0,0 +1,167 @@
//
// 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 parser
import (
"bytes"
"fmt"
"strings"
"github.com/gomarkdown/markdown/ast"
"github.com/gomarkdown/markdown/parser"
)
const (
GoMarkdown = "go_markdown"
)
type MarkdownParser struct {
libType string
}
func NewMarkdownParser(libType string) (*MarkdownParser, error) {
switch libType {
case GoMarkdown:
return &MarkdownParser{
libType: GoMarkdown,
}, nil
default:
return nil, fmt.Errorf("unsupported Markdown library type: %s", libType)
}
}
// ParseWithResult implements ParseResultProducer (plan §6.5) and
// returns a structured markdown payload that mirrors the Python
// parser's `output_format == "json"` shape. Each top-level block
// emits one item with `text` + `doc_type_kwd: "text"`. The legacy
// debug-print path has been removed; callers consume ParseResult directly.
func (p *MarkdownParser) ParseWithResult(filename string, data []byte) ParseResult {
if p.libType != GoMarkdown {
return ParseResult{Err: fmt.Errorf("unsupported Markdown library type: %s", p.libType)}
}
doc := markdownNew().Parse(data)
var items []map[string]any
walkMarkdownBlocks(doc, &items)
if items == nil {
// No blocks emitted — surface a single empty item so the
// downstream chunker sees a non-nil JSON slice (mirrors the
// Python contract of always producing at least one item).
items = []map[string]any{{"text": "", "doc_type_kwd": "text"}}
}
return ParseResult{
OutputFormat: "json",
File: map[string]any{
"name": filename,
},
JSON: items,
}
}
func (p *MarkdownParser) String() string {
return "MarkdownParser"
}
// markdownNew is a thin constructor so the extension set is owned
// in one place (both Parse and ParseWithResult consume it).
func markdownNew() *parser.Parser {
extensions := parser.CommonExtensions | parser.AutoHeadingIDs | parser.NoEmptyLineBeforeBlock
return parser.NewWithExtensions(extensions)
}
// walkMarkdownBlocks emits one normalized item per top-level block.
// Headings (LeafBlock / H*) are emitted with the heading text so a
// downstream title chunker can find them; paragraphs (Paragraph)
// emit the leaf-node text. The walker is intentionally a
// best-effort pass — full TOC / outline handling lands with the
// deepdoc/parser port — but it satisfies the per-block "emit
// text+doc_type_kwd" contract enough for a Phase-1a migration
// test to verify wire-shape parity.
func walkMarkdownBlocks(doc ast.Node, out *[]map[string]any) {
for _, child := range doc.GetChildren() {
switch n := child.(type) {
case *ast.Heading:
*out = append(*out, map[string]any{
"text": headingText(n),
"doc_type_kwd": "text",
"ck_type": "heading",
})
case *ast.Paragraph:
*out = append(*out, map[string]any{
"text": leafText(n),
"doc_type_kwd": "text",
"ck_type": "text",
})
case *ast.List:
*out = append(*out, map[string]any{
"text": leafText(n),
"doc_type_kwd": "text",
"ck_type": "list",
})
case *ast.CodeBlock:
*out = append(*out, map[string]any{
"text": leafText(n),
"doc_type_kwd": "text",
"ck_type": "code",
})
default:
// Block types we don't yet normalize (HTML, tables,
// images, definitions) are best-effort: emit the leaf
// text without a ck_type so downstream components can
// still treat them as text chunks.
txt := leafText(n)
if strings.TrimSpace(txt) != "" {
*out = append(*out, map[string]any{
"text": txt,
"doc_type_kwd": "text",
})
}
}
}
}
// headingText returns the inline-text of a heading node by
// concatenating every Leaf / Text child. Empty headings emit "".
func headingText(h *ast.Heading) string {
var buf bytes.Buffer
for _, c := range h.GetChildren() {
buf.WriteString(leafText(c))
}
return strings.TrimSpace(buf.String())
}
// leafText mirrors gomarkdown's leaf walker: walks every descendant
// leaf (Text or Inline content) and returns the concatenated UTF-8.
// Non-text containers that have no leaf descendants return "".
func leafText(n ast.Node) string {
var buf bytes.Buffer
walkLeaf(n, &buf)
return strings.TrimSpace(buf.String())
}
func walkLeaf(n ast.Node, buf *bytes.Buffer) {
switch t := n.(type) {
case *ast.Text:
buf.Write(t.Literal)
case *ast.Code:
buf.Write(t.Literal)
default:
for _, c := range n.GetChildren() {
walkLeaf(c, buf)
}
}
}