0064e946
tangwang
feat: 增量索引服务、租户配置...
|
1
|
"""
|
3c1f8031
tangwang
api/routes/indexe...
|
2
|
索引API路由。
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
3
|
|
3c1f8031
tangwang
api/routes/indexe...
|
4
|
提供全量和增量索引接口,供外部Java程序调用。
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
5
6
|
"""
|
3c1f8031
tangwang
api/routes/indexe...
|
7
8
9
|
from fastapi import APIRouter, HTTPException
from typing import List
from pydantic import BaseModel
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
10
11
|
import logging
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
12
13
14
15
16
|
logger = logging.getLogger(__name__)
router = APIRouter(prefix="/indexer", tags=["indexer"])
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
17
18
|
class ReindexRequest(BaseModel):
"""全量重建索引请求"""
|
3c1f8031
tangwang
api/routes/indexe...
|
19
20
21
22
|
tenant_id: str
recreate_index: bool = False
batch_size: int = 500
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
23
|
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
24
25
|
class IndexSpusRequest(BaseModel):
"""增量索引请求(按SPU列表索引)"""
|
3c1f8031
tangwang
api/routes/indexe...
|
26
27
|
tenant_id: str
spu_ids: List[str]
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
28
|
delete_spu_ids: List[str] = [] # 显式指定要删除的SPU ID列表(可选)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
29
|
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
30
|
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
31
32
33
34
35
36
37
38
39
40
41
42
43
|
class GetDocumentsRequest(BaseModel):
"""查询文档请求(不写入ES)"""
tenant_id: str
spu_ids: List[str]
@router.post("/reindex")
async def reindex_all(request: ReindexRequest):
"""
全量重建索引接口
将指定租户的所有SPU数据重新索引到ES。支持删除旧索引并重建。
"""
|
3c1f8031
tangwang
api/routes/indexe...
|
44
45
46
47
48
49
50
51
52
53
54
55
56
|
try:
from ..app import get_bulk_indexing_service
service = get_bulk_indexing_service()
if service is None:
raise HTTPException(status_code=503, detail="Bulk indexing service is not initialized")
return service.bulk_index(
tenant_id=request.tenant_id,
recreate_index=request.recreate_index,
batch_size=request.batch_size
)
except HTTPException:
raise
except Exception as e:
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
57
58
59
60
61
62
63
64
65
66
|
logger.error(f"Error in reindex for tenant_id={request.tenant_id}: {e}", exc_info=True)
raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
@router.post("/index")
async def index_spus(request: IndexSpusRequest):
"""
增量索引接口
根据指定的SPU ID列表,将数据索引到ES。用于增量更新指定商品。
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
67
68
69
70
71
72
73
74
75
|
支持两种删除方式:
1. **自动检测删除**:如果SPU在数据库中被标记为deleted=1,自动从ES中删除对应文档
2. **显式删除**:通过delete_spu_ids参数显式指定要删除的SPU(无论数据库状态如何)
删除策略说明:
- 数据库是唯一真实来源(Single Source of Truth)
- 自动检测:查询数据库时发现deleted=1,自动从ES删除
- 显式删除:调用方明确知道哪些SPU要删除,直接删除(适用于批量删除场景)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
76
77
78
|
"""
try:
from ..app import get_incremental_service, get_es_client
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
79
80
81
82
83
84
85
86
87
88
|
# 验证请求参数
if not request.spu_ids and not request.delete_spu_ids:
raise HTTPException(status_code=400, detail="spu_ids and delete_spu_ids cannot both be empty")
if request.spu_ids and len(request.spu_ids) > 100:
raise HTTPException(status_code=400, detail="Maximum 100 SPU IDs allowed per request for indexing")
if request.delete_spu_ids and len(request.delete_spu_ids) > 100:
raise HTTPException(status_code=400, detail="Maximum 100 SPU IDs allowed per request for deletion")
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
89
90
91
92
93
94
95
96
97
|
service = get_incremental_service()
if service is None:
raise HTTPException(status_code=503, detail="Incremental indexer service is not initialized")
es_client = get_es_client()
if es_client is None:
raise HTTPException(status_code=503, detail="Elasticsearch client is not initialized")
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
98
|
# 调用批量索引方法(支持显式删除参数)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
99
100
101
|
result = service.index_spus_to_es(
es_client=es_client,
tenant_id=request.tenant_id,
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
102
103
|
spu_ids=request.spu_ids if request.spu_ids else [],
delete_spu_ids=request.delete_spu_ids if request.delete_spu_ids else None
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
104
105
106
107
108
109
110
111
|
)
return result
except HTTPException:
raise
except Exception as e:
logger.error(f"Error indexing SPUs for tenant_id={request.tenant_id}: {e}", exc_info=True)
|
3c1f8031
tangwang
api/routes/indexe...
|
112
|
raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
113
|
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
114
|
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
115
116
117
118
119
120
121
|
@router.post("/documents")
async def get_documents(request: GetDocumentsRequest):
"""
查询文档接口
根据SPU ID列表获取ES文档数据(不写入ES)。用于查看、调试或验证SPU数据。
"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
122
123
|
try:
from ..app import get_incremental_service
|
3c1f8031
tangwang
api/routes/indexe...
|
124
125
126
127
|
if not request.spu_ids:
raise HTTPException(status_code=400, detail="spu_ids cannot be empty")
if len(request.spu_ids) > 100:
raise HTTPException(status_code=400, detail="Maximum 100 SPU IDs allowed per request")
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
128
129
|
service = get_incremental_service()
if service is None:
|
3c1f8031
tangwang
api/routes/indexe...
|
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
raise HTTPException(status_code=503, detail="Incremental indexer service is not initialized")
success_list, failed_list = [], []
for spu_id in request.spu_ids:
try:
doc = service.get_spu_document(tenant_id=request.tenant_id, spu_id=spu_id)
(success_list if doc else failed_list).append({
"spu_id": spu_id,
"document": doc
} if doc else {
"spu_id": spu_id,
"error": "SPU not found or deleted"
})
except Exception as e:
failed_list.append({"spu_id": spu_id, "error": str(e)})
return {
"success": success_list,
"failed": failed_list,
"total": len(request.spu_ids),
"success_count": len(success_list),
"failed_count": len(failed_list)
}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
151
152
153
|
except HTTPException:
raise
except Exception as e:
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
154
|
logger.error(f"Error getting documents for tenant_id={request.tenant_id}: {e}", exc_info=True)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
155
156
157
158
159
|
raise HTTPException(status_code=500, detail=f"Internal server error: {str(e)}")
@router.get("/health")
async def indexer_health_check():
|
3c1f8031
tangwang
api/routes/indexe...
|
160
|
"""检查索引服务健康状态"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
161
162
|
try:
from ..app import get_incremental_service
|
3c1f8031
tangwang
api/routes/indexe...
|
163
|
from sqlalchemy import text
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
164
165
|
service = get_incremental_service()
if service is None:
|
3c1f8031
tangwang
api/routes/indexe...
|
166
|
return {"status": "unavailable", "database": "unknown", "preloaded_data": {"category_mappings": 0}}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
167
|
try:
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
168
169
170
171
172
|
with service.db_engine.connect() as conn:
conn.execute(text("SELECT 1"))
db_status = "connected"
except Exception as e:
db_status = f"disconnected: {str(e)}"
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
173
174
175
|
return {
"status": "available",
"database": db_status,
|
3c1f8031
tangwang
api/routes/indexe...
|
176
|
"preloaded_data": {"category_mappings": len(service.category_id_to_name)}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
177
|
}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
178
179
|
except Exception as e:
logger.error(f"Error checking indexer health: {e}", exc_info=True)
|
3c1f8031
tangwang
api/routes/indexe...
|
180
|
return {"status": "error", "message": str(e)}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
|
|