-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: refine chat flow and retrievers (#589)
close #565 - [x] Add VectorSearchRetrieverr (support single KB pure retrieve) - [x] metadata filters - [ ] similarity_threshold - [x] Add VectorSearchFusionRetriever - [ ] support multiple KB route - [x] support query decompose - [x] Add KnowledgeGraphRetriever (support single KB pure retrieve) - [x] Add `KnowledgeGraphNode` (llamaindex node) - [x] metadata filters - [ ] similarity_threshold - [x] Add KnowledgeGraphFusionRetriever - [ ] support multiple KB route - [x] support query decompose (old IntentAnalyzer) - [x] Add retrieve APIs - [x] `/api/v1/retrieve/chunks` - [x] `/api/v1/retrieve/knowledge_graph` - [x] `/api/v1/admin/knowledge_bases/{kb_id}/chunks/retrieve` - [x] `/api/v1/admin/knowledge_bases/{kb_id}/graph/retrieve` - [x] Integration with ChatService - [ ] tests and fix bug Feature PRs: - merge `TiDBGraphEditor` to `TiDBGraphStore`, TiDBGraphStore will only retain storage layer operactions, so it shouldn't depend on DsPy or LLM. - `TiDBKnowledgeGraphIndex` will handle the merge entities parts. - `KnowledgeGraphRetriever` will handle query compose parts.
Showing
75 changed files
with
2,512 additions
and
1,585 deletions.
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
13 changes: 13 additions & 0 deletions
13
backend/app/api/admin_routes/knowledge_base/chunk/models.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
from pydantic import BaseModel | ||
|
||
from app.rag.retrievers.chunk.schema import VectorSearchRetrieverConfig | ||
|
||
|
||
class KBChunkRetrievalConfig(BaseModel): | ||
vector_search: VectorSearchRetrieverConfig | ||
# TODO: add fulltext and knowledge graph search config | ||
|
||
|
||
class KBRetrieveChunksRequest(BaseModel): | ||
query: str | ||
retrieval_config: KBChunkRetrievalConfig |
38 changes: 38 additions & 0 deletions
38
backend/app/api/admin_routes/knowledge_base/chunk/routes.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
import logging | ||
|
||
from fastapi import APIRouter | ||
from app.api.deps import SessionDep, CurrentSuperuserDep | ||
from app.rag.retrievers.chunk.simple_retriever import ( | ||
ChunkSimpleRetriever, | ||
) | ||
from app.rag.retrievers.chunk.schema import ChunksRetrievalResult | ||
|
||
from app.exceptions import InternalServerError, KBNotFound | ||
from .models import KBRetrieveChunksRequest | ||
|
||
router = APIRouter() | ||
logger = logging.getLogger(__name__) | ||
|
||
|
||
@router.post("/admin/knowledge_base/{kb_id}/chunks/retrieve") | ||
def retrieve_chunks( | ||
db_session: SessionDep, | ||
user: CurrentSuperuserDep, | ||
kb_id: int, | ||
request: KBRetrieveChunksRequest, | ||
) -> ChunksRetrievalResult: | ||
try: | ||
vector_search_config = request.retrieval_config.vector_search | ||
retriever = ChunkSimpleRetriever( | ||
db_session=db_session, | ||
knowledge_base_id=kb_id, | ||
config=vector_search_config, | ||
) | ||
return retriever.retrieve_chunks( | ||
request.query, | ||
) | ||
except KBNotFound as e: | ||
raise e | ||
except Exception as e: | ||
logger.exception(e) | ||
raise InternalServerError() |
Empty file.
82 changes: 82 additions & 0 deletions
82
backend/app/api/admin_routes/knowledge_base/graph/knowledge/routes.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
from fastapi import HTTPException | ||
from starlette import status | ||
|
||
from app.api.admin_routes.knowledge_base.graph.models import ( | ||
KnowledgeRequest, | ||
KnowledgeNeighborRequest, | ||
KnowledgeChunkRequest, | ||
) | ||
from app.api.admin_routes.knowledge_base.graph.routes import router, logger | ||
from app.api.deps import SessionDep | ||
from app.exceptions import KBNotFound, InternalServerError | ||
from app.rag.knowledge_base.index_store import get_kb_tidb_graph_store | ||
from app.repositories import knowledge_base_repo | ||
|
||
|
||
# Experimental interface | ||
|
||
|
||
@router.post("/admin/knowledge_bases/{kb_id}/graph/knowledge") | ||
def retrieve_knowledge(session: SessionDep, kb_id: int, request: KnowledgeRequest): | ||
try: | ||
kb = knowledge_base_repo.must_get(session, kb_id) | ||
graph_store = get_kb_tidb_graph_store(session, kb) | ||
data = graph_store.retrieve_graph_data( | ||
request.query, | ||
request.top_k, | ||
request.similarity_threshold, | ||
) | ||
return { | ||
"entities": data["entities"], | ||
"relationships": data["relationships"], | ||
} | ||
except KBNotFound as e: | ||
raise e | ||
except Exception as e: | ||
logger.exception(e) | ||
raise InternalServerError() | ||
|
||
|
||
@router.post("/admin/knowledge_bases/{kb_id}/graph/knowledge/neighbors") | ||
def retrieve_knowledge_neighbors( | ||
session: SessionDep, kb_id: int, request: KnowledgeNeighborRequest | ||
): | ||
try: | ||
kb = knowledge_base_repo.must_get(session, kb_id) | ||
graph_store = get_kb_tidb_graph_store(session, kb) | ||
data = graph_store.retrieve_neighbors( | ||
request.entities_ids, | ||
request.query, | ||
request.max_depth, | ||
request.max_neighbors, | ||
request.similarity_threshold, | ||
) | ||
return data | ||
except KBNotFound as e: | ||
raise e | ||
except Exception as e: | ||
logger.exception(e) | ||
raise InternalServerError() | ||
|
||
|
||
@router.post("/admin/knowledge_bases/{kb_id}/graph/knowledge/chunks") | ||
def retrieve_knowledge_chunks( | ||
session: SessionDep, kb_id: int, request: KnowledgeChunkRequest | ||
): | ||
try: | ||
kb = knowledge_base_repo.must_get(session, kb_id) | ||
graph_store = get_kb_tidb_graph_store(session, kb) | ||
data = graph_store.get_chunks_by_relationships(request.relationships_ids) | ||
if not data: | ||
raise HTTPException( | ||
status_code=status.HTTP_404_NOT_FOUND, | ||
detail="No chunks found for the given relationships", | ||
) | ||
return data | ||
except KBNotFound as e: | ||
raise e | ||
except HTTPException as e: | ||
raise e | ||
except Exception as e: | ||
logger.exception(e) | ||
raise InternalServerError() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.