be52af70
tangwang
first commit
|
1
2
3
4
|
"""
Search API routes.
"""
|
16c42787
tangwang
feat: implement r...
|
5
|
from fastapi import APIRouter, HTTPException, Query, Request
|
be52af70
tangwang
first commit
|
6
|
from typing import Optional
|
16c42787
tangwang
feat: implement r...
|
7
|
import uuid
|
be52af70
tangwang
first commit
|
8
9
10
11
12
|
from ..models import (
SearchRequest,
ImageSearchRequest,
SearchResponse,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
13
|
SearchSuggestResponse,
|
be52af70
tangwang
first commit
|
14
15
16
|
DocumentResponse,
ErrorResponse
)
|
16c42787
tangwang
feat: implement r...
|
17
|
from context.request_context import create_request_context, set_current_request_context, clear_current_request_context
|
be52af70
tangwang
first commit
|
18
19
20
21
|
router = APIRouter(prefix="/search", tags=["search"])
|
16c42787
tangwang
feat: implement r...
|
22
23
24
25
26
|
def extract_request_info(request: Request) -> tuple[str, str]:
"""Extract request ID and user ID from HTTP request"""
# Try to get request ID from headers
reqid = request.headers.get('X-Request-ID') or str(uuid.uuid4())[:8]
|
99bea633
tangwang
add logs
|
27
28
|
# Try to get user ID from headers; if not found, use "-1" for correlation
uid = request.headers.get('X-User-ID') or request.headers.get('User-ID') or "-1"
|
16c42787
tangwang
feat: implement r...
|
29
30
31
32
|
return reqid, uid
|
be52af70
tangwang
first commit
|
33
|
@router.post("/", response_model=SearchResponse)
|
16c42787
tangwang
feat: implement r...
|
34
|
async def search(request: SearchRequest, http_request: Request):
|
be52af70
tangwang
first commit
|
35
|
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
36
|
Execute text search query (外部友好格式).
|
be52af70
tangwang
first commit
|
37
38
39
40
41
42
|
Supports:
- Multi-language query processing
- Boolean operators (AND, OR, RANK, ANDNOT)
- Semantic search with embeddings
- Custom ranking functions
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
43
44
|
- Exact match filters and range filters
- Faceted search
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
45
46
|
Requires tenant_id in header (X-Tenant-ID) or query parameter (tenant_id).
|
be52af70
tangwang
first commit
|
47
|
"""
|
16c42787
tangwang
feat: implement r...
|
48
49
|
reqid, uid = extract_request_info(http_request)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
# Extract tenant_id (required)
tenant_id = http_request.headers.get('X-Tenant-ID')
if not tenant_id:
# Try to get from query string
from urllib.parse import parse_qs
query_string = http_request.url.query
if query_string:
params = parse_qs(query_string)
tenant_id = params.get('tenant_id', [None])[0]
if not tenant_id:
raise HTTPException(
status_code=400,
detail="tenant_id is required. Provide it via header 'X-Tenant-ID' or query parameter 'tenant_id'"
)
|
16c42787
tangwang
feat: implement r...
|
66
67
68
69
70
|
# Create request context
context = create_request_context(reqid=reqid, uid=uid)
# Set context in thread-local storage
set_current_request_context(context)
|
be52af70
tangwang
first commit
|
71
72
|
try:
|
99bea633
tangwang
add logs
|
73
74
75
|
# Log request start (English logs, with key search parameters)
client_ip = http_request.client.host if http_request.client else "unknown"
user_agent = http_request.headers.get("User-Agent", "unknown")[:200]
|
16c42787
tangwang
feat: implement r...
|
76
|
context.logger.info(
|
99bea633
tangwang
add logs
|
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
"Received search request | "
f"Tenant: {tenant_id} | "
f"Query: {request.query} | "
f"IP: {client_ip} | "
f"User agent: {user_agent} | "
f"size: {request.size} | from: {request.from_} | "
f"sort_by: {request.sort_by} | sort_order: {request.sort_order} | "
f"min_score: {request.min_score} | "
f"language: {request.language} | "
f"debug: {request.debug} | "
f"sku_filter_dimension: {request.sku_filter_dimension} | "
f"filters: {request.filters} | "
f"range_filters: {request.range_filters} | "
f"facets: {request.facets}",
|
16c42787
tangwang
feat: implement r...
|
91
92
93
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
be52af70
tangwang
first commit
|
94
|
# Get searcher from app state
|
bb3c5ef8
tangwang
灌入数据流程跑通
|
95
|
from api.app import get_searcher
|
be52af70
tangwang
first commit
|
96
97
|
searcher = get_searcher()
|
16c42787
tangwang
feat: implement r...
|
98
|
# Execute search with context (using backend defaults from config)
|
be52af70
tangwang
first commit
|
99
100
|
result = searcher.search(
query=request.query,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
101
|
tenant_id=tenant_id,
|
be52af70
tangwang
first commit
|
102
103
104
|
size=request.size,
from_=request.from_,
filters=request.filters,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
105
106
|
range_filters=request.range_filters,
facets=request.facets,
|
16c42787
tangwang
feat: implement r...
|
107
|
min_score=request.min_score,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
108
|
context=context,
|
c86c8237
tangwang
支持聚合。过滤项补充了逻辑,但是有问题
|
109
|
sort_by=request.sort_by,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
110
|
sort_order=request.sort_order,
|
577ec972
tangwang
返回给前端的字段、格式适配。主要包...
|
111
112
|
debug=request.debug,
language=request.language,
|
ca91352a
tangwang
更新文档
|
113
|
sku_filter_dimension=request.sku_filter_dimension,
|
be52af70
tangwang
first commit
|
114
115
|
)
|
16c42787
tangwang
feat: implement r...
|
116
117
118
|
# Include performance summary in response
performance_summary = context.get_summary() if context else None
|
be52af70
tangwang
first commit
|
119
120
|
# Convert to response model
return SearchResponse(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
121
|
results=result.results,
|
be52af70
tangwang
first commit
|
122
123
124
|
total=result.total,
max_score=result.max_score,
took_ms=result.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
125
|
facets=result.facets,
|
16c42787
tangwang
feat: implement r...
|
126
|
query_info=result.query_info,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
127
128
|
suggestions=result.suggestions,
related_searches=result.related_searches,
|
1f071951
tangwang
补充调试信息,记录包括各个阶段的 ...
|
129
130
|
performance_info=performance_summary,
debug_info=result.debug_info
|
be52af70
tangwang
first commit
|
131
132
133
|
)
except Exception as e:
|
16c42787
tangwang
feat: implement r...
|
134
135
136
137
|
# Log error in context
if context:
context.set_error(e)
context.logger.error(
|
99bea633
tangwang
add logs
|
138
|
f"Search request failed | error: {str(e)}",
|
16c42787
tangwang
feat: implement r...
|
139
140
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
be52af70
tangwang
first commit
|
141
|
raise HTTPException(status_code=500, detail=str(e))
|
16c42787
tangwang
feat: implement r...
|
142
143
144
|
finally:
# Clear thread-local context
clear_current_request_context()
|
be52af70
tangwang
first commit
|
145
146
147
|
@router.post("/image", response_model=SearchResponse)
|
16c42787
tangwang
feat: implement r...
|
148
|
async def search_by_image(request: ImageSearchRequest, http_request: Request):
|
be52af70
tangwang
first commit
|
149
|
"""
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
150
|
Search by image similarity (外部友好格式).
|
be52af70
tangwang
first commit
|
151
152
|
Uses image embeddings to find visually similar products.
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
153
|
Supports exact match filters and range filters.
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
154
155
|
Requires tenant_id in header (X-Tenant-ID) or query parameter (tenant_id).
|
be52af70
tangwang
first commit
|
156
|
"""
|
16c42787
tangwang
feat: implement r...
|
157
158
|
reqid, uid = extract_request_info(http_request)
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
# Extract tenant_id (required)
tenant_id = http_request.headers.get('X-Tenant-ID')
if not tenant_id:
from urllib.parse import parse_qs
query_string = http_request.url.query
if query_string:
params = parse_qs(query_string)
tenant_id = params.get('tenant_id', [None])[0]
if not tenant_id:
raise HTTPException(
status_code=400,
detail="tenant_id is required. Provide it via header 'X-Tenant-ID' or query parameter 'tenant_id'"
)
|
16c42787
tangwang
feat: implement r...
|
174
175
176
177
178
179
|
# Create request context
context = create_request_context(reqid=reqid, uid=uid)
# Set context in thread-local storage
set_current_request_context(context)
|
be52af70
tangwang
first commit
|
180
|
try:
|
99bea633
tangwang
add logs
|
181
182
|
# Log request start for image search (English)
client_ip = http_request.client.host if http_request.client else "unknown"
|
16c42787
tangwang
feat: implement r...
|
183
|
context.logger.info(
|
99bea633
tangwang
add logs
|
184
185
186
187
|
"Received image search request | "
f"Tenant: {tenant_id} | "
f"Image URL: {request.image_url} | "
f"IP: {client_ip}",
|
16c42787
tangwang
feat: implement r...
|
188
189
190
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
bb3c5ef8
tangwang
灌入数据流程跑通
|
191
|
from api.app import get_searcher
|
be52af70
tangwang
first commit
|
192
193
194
195
196
|
searcher = get_searcher()
# Execute image search
result = searcher.search_by_image(
image_url=request.image_url,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
197
|
tenant_id=tenant_id,
|
be52af70
tangwang
first commit
|
198
|
size=request.size,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
199
200
|
filters=request.filters,
range_filters=request.range_filters
|
be52af70
tangwang
first commit
|
201
202
|
)
|
16c42787
tangwang
feat: implement r...
|
203
204
205
|
# Include performance summary in response
performance_summary = context.get_summary() if context else None
|
be52af70
tangwang
first commit
|
206
|
return SearchResponse(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
207
|
results=result.results,
|
be52af70
tangwang
first commit
|
208
209
210
|
total=result.total,
max_score=result.max_score,
took_ms=result.took_ms,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
211
|
facets=result.facets,
|
16c42787
tangwang
feat: implement r...
|
212
|
query_info=result.query_info,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
213
214
|
suggestions=result.suggestions,
related_searches=result.related_searches,
|
16c42787
tangwang
feat: implement r...
|
215
|
performance_info=performance_summary
|
be52af70
tangwang
first commit
|
216
217
218
|
)
except ValueError as e:
|
16c42787
tangwang
feat: implement r...
|
219
220
221
|
if context:
context.set_error(e)
context.logger.error(
|
99bea633
tangwang
add logs
|
222
|
f"Image search request parameter error | error: {str(e)}",
|
16c42787
tangwang
feat: implement r...
|
223
224
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
be52af70
tangwang
first commit
|
225
226
|
raise HTTPException(status_code=400, detail=str(e))
except Exception as e:
|
16c42787
tangwang
feat: implement r...
|
227
228
229
|
if context:
context.set_error(e)
context.logger.error(
|
99bea633
tangwang
add logs
|
230
|
f"Image search request failed | error: {str(e)}",
|
16c42787
tangwang
feat: implement r...
|
231
232
|
extra={'reqid': context.reqid, 'uid': context.uid}
)
|
be52af70
tangwang
first commit
|
233
|
raise HTTPException(status_code=500, detail=str(e))
|
16c42787
tangwang
feat: implement r...
|
234
235
236
|
finally:
# Clear thread-local context
clear_current_request_context()
|
be52af70
tangwang
first commit
|
237
238
|
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
@router.get("/suggestions", response_model=SearchSuggestResponse)
async def search_suggestions(
q: str = Query(..., min_length=1, description="搜索查询"),
size: int = Query(5, ge=1, le=20, description="建议数量"),
types: str = Query("query", description="建议类型(逗号分隔): query, product, category, brand")
):
"""
获取搜索建议(自动补全)。
功能说明:
- 查询建议(query):基于历史搜索和热门搜索
- 商品建议(product):匹配的商品
- 类目建议(category):匹配的类目
- 品牌建议(brand):匹配的品牌
注意:此功能暂未实现,仅返回框架响应。
"""
import time
start_time = time.time()
# TODO: 实现搜索建议逻辑
# 1. 从搜索历史中获取建议
# 2. 从商品标题中匹配前缀
# 3. 从类目、品牌中匹配
# 临时返回空结果
suggestions = []
# 示例结构(暂不实现):
# suggestions = [
# {
# "text": "芭比娃娃",
# "type": "query",
# "highlight": "<em>芭</em>比娃娃",
# "popularity": 850
# }
# ]
took_ms = int((time.time() - start_time) * 1000)
return SearchSuggestResponse(
query=q,
suggestions=suggestions,
took_ms=took_ms
)
@router.get("/instant", response_model=SearchResponse)
async def instant_search(
q: str = Query(..., min_length=2, description="搜索查询"),
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
289
290
|
size: int = Query(5, ge=1, le=20, description="结果数量"),
tenant_id: str = Query(..., description="租户ID")
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
|
):
"""
即时搜索(Instant Search)。
功能说明:
- 边输入边搜索,无需点击搜索按钮
- 返回简化的搜索结果
注意:此功能暂未实现,调用标准搜索接口。
TODO: 优化即时搜索性能
- 添加防抖/节流
- 实现结果缓存
- 简化返回字段
"""
from api.app import get_searcher
searcher = get_searcher()
result = searcher.search(
query=q,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
310
|
tenant_id=tenant_id,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
311
|
size=size,
|
ca91352a
tangwang
更新文档
|
312
313
|
from_=0,
sku_filter_dimension=None # Instant search doesn't support SKU filtering
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
314
315
316
|
)
return SearchResponse(
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
317
|
results=result.results,
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
318
319
320
321
|
total=result.total,
max_score=result.max_score,
took_ms=result.took_ms,
facets=result.facets,
|
1f6d15fa
tangwang
重构:SPU级别索引、统一索引架构...
|
322
323
324
|
query_info=result.query_info,
suggestions=result.suggestions,
related_searches=result.related_searches
|
6aa246be
tangwang
问题:Pydantic 应该能自动...
|
325
326
327
|
)
|
be52af70
tangwang
first commit
|
328
329
330
331
332
333
|
@router.get("/{doc_id}", response_model=DocumentResponse)
async def get_document(doc_id: str):
"""
Get a single document by ID.
"""
try:
|
bb3c5ef8
tangwang
灌入数据流程跑通
|
334
|
from api.app import get_searcher
|
be52af70
tangwang
first commit
|
335
336
337
338
339
340
341
342
343
344
345
346
347
|
searcher = get_searcher()
doc = searcher.get_document(doc_id)
if doc is None:
raise HTTPException(status_code=404, detail=f"Document {doc_id} not found")
return DocumentResponse(id=doc_id, source=doc)
except HTTPException:
raise
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
|