Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add page_number attribute to document segments and update related retrieval logic #13742

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions api/core/rag/docstore/dataset_docstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ def add_documents(self, docs: Sequence[Document], allow_update: bool = True, sav
tokens=tokens,
enabled=False,
created_by=self._user_id,
page_number=doc.metadata.get("page", 0),
)
if doc.metadata.get("answer"):
segment_document.answer = doc.metadata.pop("answer", "")
Expand Down
1 change: 1 addition & 0 deletions api/core/rag/retrieval/dataset_retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ def retrieve(
source["word_count"] = segment.word_count
source["segment_position"] = segment.position
source["index_node_hash"] = segment.index_node_hash
source["page_number"] = segment.page_number
if segment.answer:
source["content"] = f"question:{segment.content} \nanswer:{segment.answer}"
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ def _run(self, query: str) -> str:
source["word_count"] = segment.word_count
source["segment_position"] = segment.position
source["index_node_hash"] = segment.index_node_hash
source["page_number"] = segment.page_number
if segment.answer:
source["content"] = f"question:{segment.content} \nanswer:{segment.answer}"
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ def _run(self, query: str) -> str:
source["word_count"] = segment.word_count
source["segment_position"] = segment.position
source["index_node_hash"] = segment.index_node_hash
source["page_number"] = segment.page_number
if segment.answer:
source["content"] = f"question:{segment.content} \nanswer:{segment.answer}"
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ def _fetch_dataset_retriever(self, node_data: KnowledgeRetrievalNodeData, query:
"segment_word_count": segment.word_count,
"segment_position": segment.position,
"segment_index_node_hash": segment.index_node_hash,
"segment_page_number": segment.page_number,
},
"title": document.name,
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
"""Add page_number column to document_segment

Revision ID: 179653aaaf88
Revises: a91b476a53de
Create Date: 2025-02-14 06:57:54.547192

"""
from alembic import op
import models as models
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision = '179653aaaf88'
down_revision = 'a91b476a53de'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('document_segments', schema=None) as batch_op:
batch_op.add_column(sa.Column('page_number', sa.Integer(), nullable=True))

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
with op.batch_alter_table('document_segments', schema=None) as batch_op:
batch_op.drop_column('page_number')

# ### end Alembic commands ###
1 change: 1 addition & 0 deletions api/models/dataset.py
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ class DocumentSegment(db.Model): # type: ignore[name-defined]
dataset_id = db.Column(StringUUID, nullable=False)
document_id = db.Column(StringUUID, nullable=False)
position: Mapped[int]
page_number = db.Column(db.Integer, nullable=True)
content = db.Column(db.Text, nullable=False)
answer = db.Column(db.Text, nullable=True)
word_count = db.Column(db.Integer, nullable=False)
Expand Down
Loading