3c1f8031
tangwang
api/routes/indexe...
|
1
|
"""增量数据获取服务"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
2
3
|
import pandas as pd
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
4
|
import logging
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
5
|
import time
|
5c2b70a2
tangwang
search_products.json
|
6
7
|
import threading
from typing import Dict, Any, Optional, List, Tuple
|
b2e50710
tangwang
BgeEncoder.encode...
|
8
|
import numpy as np
|
5c2b70a2
tangwang
search_products.json
|
9
|
from sqlalchemy import text, bindparam
|
3c1f8031
tangwang
api/routes/indexe...
|
10
|
from indexer.indexing_utils import load_category_mapping, create_document_transformer
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
11
|
from indexer.bulk_indexer import BulkIndexer
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
12
|
from indexer.mapping_generator import get_tenant_index_name
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
13
14
15
|
from indexer.indexer_logger import (
get_indexer_logger, log_index_request, log_index_result, log_spu_processing
)
|
86d8358b
tangwang
config optimize
|
16
|
from config import get_app_config
|
0fd2f875
tangwang
translate
|
17
|
from translation import create_translation_client
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
18
19
20
|
# Configure logger
logger = logging.getLogger(__name__)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
21
22
|
# Indexer专用日志器
indexer_logger = get_indexer_logger()
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
23
24
25
|
class IncrementalIndexerService:
|
3c1f8031
tangwang
api/routes/indexe...
|
26
|
"""增量索引服务,提供SPU数据获取功能。"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
27
28
|
def __init__(self, db_engine: Any):
|
3c1f8031
tangwang
api/routes/indexe...
|
29
|
"""初始化增量索引服务"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
30
31
32
|
self.db_engine = db_engine
# 预加载分类映射(全局,所有租户共享)
|
3c1f8031
tangwang
api/routes/indexe...
|
33
|
self.category_id_to_name = load_category_mapping(db_engine)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
34
|
logger.info(f"Preloaded {len(self.category_id_to_name)} category mappings")
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
35
|
|
cc11ae04
tangwang
cnclip
|
36
|
# 缓存:避免频繁增量请求重复加载 config / 构造 transformer
|
ed948666
tangwang
tidy
|
37
|
# 启动阶段强校验初始化:
|
cc11ae04
tangwang
cnclip
|
38
|
# - config.yaml 加载
|
ed948666
tangwang
tidy
|
39
|
# - translator / embedding / image encoder provider 初始化
|
5c2b70a2
tangwang
search_products.json
|
40
41
|
self._config: Optional[Any] = None
self._config_lock = threading.Lock()
|
cc11ae04
tangwang
cnclip
|
42
|
self._translator: Optional[Any] = None
|
cc11ae04
tangwang
cnclip
|
43
44
45
46
47
|
self._searchable_option_dimensions: Optional[List[str]] = None
self._shared_text_encoder: Optional[Any] = None
self._shared_image_encoder: Optional[Any] = None
self._eager_init()
|
5c2b70a2
tangwang
search_products.json
|
48
49
50
51
|
# tenant_id -> (transformer, encoder, enable_embedding)
self._transformer_cache: Dict[str, Tuple[Any, Optional[Any], bool]] = {}
self._transformer_cache_lock = threading.Lock()
|
cc11ae04
tangwang
cnclip
|
52
|
def _eager_init(self) -> None:
|
ed948666
tangwang
tidy
|
53
|
"""Strict eager initialization. Any dependency failure should fail fast."""
|
86d8358b
tangwang
config optimize
|
54
|
self._config = get_app_config().search
|
ed948666
tangwang
tidy
|
55
56
57
58
|
self._searchable_option_dimensions = (
getattr(self._config.spu_config, "searchable_option_dimensions", None)
or ["option1", "option2", "option3"]
)
|
cc11ae04
tangwang
cnclip
|
59
|
|
0fd2f875
tangwang
translate
|
60
|
self._translator = create_translation_client()
|
cc11ae04
tangwang
cnclip
|
61
|
|
ed948666
tangwang
tidy
|
62
|
# Text embedding encoder (strict when enabled)
|
cc11ae04
tangwang
cnclip
|
63
|
if bool(getattr(self._config.query_config, "enable_text_embedding", False)):
|
ed948666
tangwang
tidy
|
64
|
from embeddings.text_encoder import TextEmbeddingEncoder
|
cc11ae04
tangwang
cnclip
|
65
|
|
ed948666
tangwang
tidy
|
66
67
68
|
self._shared_text_encoder = TextEmbeddingEncoder()
else:
self._shared_text_encoder = None
|
cc11ae04
tangwang
cnclip
|
69
|
|
ed948666
tangwang
tidy
|
70
71
|
# Image embedding encoder (strict)
from embeddings.image_encoder import CLIPImageEncoder
|
cc11ae04
tangwang
cnclip
|
72
|
|
ed948666
tangwang
tidy
|
73
|
self._shared_image_encoder = CLIPImageEncoder()
|
cc11ae04
tangwang
cnclip
|
74
|
|
5c2b70a2
tangwang
search_products.json
|
75
76
|
def _get_config(self) -> Any:
"""Load config once per process (thread-safe)."""
|
ed948666
tangwang
tidy
|
77
78
|
if self._config is None:
raise RuntimeError("Indexer config is not initialized")
|
5c2b70a2
tangwang
search_products.json
|
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
return self._config
def _get_transformer_bundle(self, tenant_id: str) -> Tuple[Any, Optional[Any], bool]:
"""
Get a cached document transformer for tenant_id.
- Transformer is built once per tenant (in-process cache).
- We disable per-document embedding generation inside transformer, and instead
batch-generate embeddings in index_spus_to_es for performance.
"""
with self._transformer_cache_lock:
cached = self._transformer_cache.get(str(tenant_id))
if cached is not None:
return cached
config = self._get_config()
enable_embedding = bool(getattr(config.query_config, "enable_text_embedding", False))
|
cc11ae04
tangwang
cnclip
|
97
98
|
encoder: Optional[Any] = self._shared_text_encoder if enable_embedding else None
if enable_embedding and encoder is None:
|
ed948666
tangwang
tidy
|
99
|
raise RuntimeError("Text embedding is enabled but TextEmbeddingEncoder is not initialized")
|
5c2b70a2
tangwang
search_products.json
|
100
|
|
cc11ae04
tangwang
cnclip
|
101
102
|
image_encoder: Optional[Any] = self._shared_image_encoder
if image_encoder is None:
|
ed948666
tangwang
tidy
|
103
|
raise RuntimeError("CLIPImageEncoder is not initialized")
|
e7a2c0b7
tangwang
img encode
|
104
|
|
5c2b70a2
tangwang
search_products.json
|
105
106
107
|
transformer = create_document_transformer(
category_id_to_name=self.category_id_to_name,
tenant_id=tenant_id,
|
cc11ae04
tangwang
cnclip
|
108
109
|
searchable_option_dimensions=self._searchable_option_dimensions,
translator=self._translator,
|
5c2b70a2
tangwang
search_products.json
|
110
111
|
encoder=encoder,
enable_title_embedding=False, # batch fill later
|
e7a2c0b7
tangwang
img encode
|
112
|
image_encoder=image_encoder,
|
ed948666
tangwang
tidy
|
113
|
enable_image_embedding=True,
|
5c2b70a2
tangwang
search_products.json
|
114
115
116
117
118
119
120
121
122
|
config=config,
)
bundle = (transformer, encoder, enable_embedding)
with self._transformer_cache_lock:
# simple unbounded cache; tenant count is typically small in one node
self._transformer_cache[str(tenant_id)] = bundle
return bundle
|
cc11ae04
tangwang
cnclip
|
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
|
def warmup_transformers(self, tenant_ids: List[str]) -> Dict[str, Any]:
"""
Eagerly build transformer bundles for given tenant ids.
This moves per-tenant initialization to startup phase, reducing first-request latency.
"""
start = time.time()
ok = 0
failed: List[Dict[str, str]] = []
for tid in tenant_ids or []:
try:
_ = self._get_transformer_bundle(str(tid))
ok += 1
except Exception as e:
failed.append({"tenant_id": str(tid), "error": str(e)})
elapsed_ms = round((time.time() - start) * 1000.0, 3)
return {"requested": len(tenant_ids or []), "warmed": ok, "failed": failed, "elapsed_ms": elapsed_ms}
|
5c2b70a2
tangwang
search_products.json
|
140
141
142
143
144
145
146
147
148
149
150
|
@staticmethod
def _normalize_spu_ids(spu_ids: List[str]) -> List[int]:
"""Normalize SPU IDs to ints for DB queries; skip non-int IDs."""
out: List[int] = []
for x in spu_ids:
try:
out.append(int(x))
except Exception:
continue
return out
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
151
|
def get_spu_document(self, tenant_id: str, spu_id: str) -> Optional[Dict[str, Any]]:
|
3c1f8031
tangwang
api/routes/indexe...
|
152
|
"""获取SPU的ES文档数据"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
153
154
155
156
157
158
159
160
161
162
163
164
165
|
try:
# 加载SPU数据
spu_row = self._load_single_spu(tenant_id, spu_id)
if spu_row is None:
logger.warning(f"SPU {spu_id} not found for tenant_id={tenant_id}")
return None
# 加载SKU数据
skus_df = self._load_skus_for_spu(tenant_id, spu_id)
# 加载Option数据
options_df = self._load_options_for_spu(tenant_id, spu_id)
|
5c2b70a2
tangwang
search_products.json
|
166
|
transformer, encoder, enable_embedding = self._get_transformer_bundle(tenant_id)
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
167
168
169
170
171
172
173
174
175
176
177
178
179
|
# 转换为ES文档
doc = transformer.transform_spu_to_doc(
tenant_id=tenant_id,
spu_row=spu_row,
skus=skus_df,
options=options_df
)
if doc is None:
logger.warning(f"Failed to transform SPU {spu_id} for tenant_id={tenant_id}")
return None
|
5c2b70a2
tangwang
search_products.json
|
180
181
|
# 单条场景下也可补齐 embedding(仍走缓存)
if enable_embedding and encoder:
|
d7d48f52
tangwang
改动(mapping + 灌入结构)
|
182
183
184
185
186
187
188
189
190
|
title_obj = doc.get("title") or {}
title_text = None
if isinstance(title_obj, dict):
title_text = title_obj.get("en") or title_obj.get("zh")
if not title_text:
for v in title_obj.values():
if v and str(v).strip():
title_text = str(v)
break
|
5c2b70a2
tangwang
search_products.json
|
191
|
if title_text and str(title_text).strip():
|
ed948666
tangwang
tidy
|
192
193
194
195
196
197
198
|
embeddings = encoder.encode(title_text)
if embeddings is None or len(embeddings) == 0:
raise RuntimeError(f"Failed to generate title embedding for spu_id={spu_id}")
emb0 = np.asarray(embeddings[0], dtype=np.float32)
if emb0.ndim != 1 or emb0.size == 0 or not np.isfinite(emb0).all():
raise RuntimeError(f"Invalid title embedding for spu_id={spu_id}")
doc["title_embedding"] = emb0.tolist()
|
5c2b70a2
tangwang
search_products.json
|
199
|
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
200
201
202
203
204
205
|
return doc
except Exception as e:
logger.error(f"Error getting SPU document for tenant_id={tenant_id}, spu_id={spu_id}: {e}", exc_info=True)
raise
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
def _load_single_spu(self, tenant_id: str, spu_id: str, include_deleted: bool = False) -> Optional[pd.Series]:
"""
加载单个SPU数据
Args:
tenant_id: 租户ID
spu_id: SPU ID
include_deleted: 是否包含已删除的记录(用于检查删除状态)
Returns:
SPU数据Series,如果不存在返回None
"""
if include_deleted:
# 查询所有记录(包括已删除的),用于检查删除状态
query = text("""
SELECT
id, shop_id, shoplazza_id, title, brief, description,
spu, vendor, vendor_url,
image_src, image_width, image_height, image_path, image_alt,
tags, note, category, category_id, category_google_id,
category_level, category_path,
|
89638140
tangwang
重构 indexer 文档构建接口...
|
227
|
fake_sales, display_fake_sales,
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
tenant_id, creator, create_time, updater, update_time, deleted
FROM shoplazza_product_spu
WHERE tenant_id = :tenant_id AND id = :spu_id
LIMIT 1
""")
else:
# 只查询未删除的记录
query = text("""
SELECT
id, shop_id, shoplazza_id, title, brief, description,
spu, vendor, vendor_url,
image_src, image_width, image_height, image_path, image_alt,
tags, note, category, category_id, category_google_id,
category_level, category_path,
|
89638140
tangwang
重构 indexer 文档构建接口...
|
242
|
fake_sales, display_fake_sales,
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
243
244
245
246
247
|
tenant_id, creator, create_time, updater, update_time, deleted
FROM shoplazza_product_spu
WHERE tenant_id = :tenant_id AND id = :spu_id AND deleted = 0
LIMIT 1
""")
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
248
249
250
251
252
253
254
255
|
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_id": spu_id})
if df.empty:
return None
return df.iloc[0]
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
|
def check_spu_deleted(self, tenant_id: str, spu_id: str) -> bool:
"""
检查SPU是否在数据库中被标记为删除
Args:
tenant_id: 租户ID
spu_id: SPU ID
Returns:
True表示已删除,False表示未删除或不存在
"""
spu_row = self._load_single_spu(tenant_id, spu_id, include_deleted=True)
if spu_row is None:
# SPU不存在,视为需要删除
return True
# 检查deleted字段(可能是bit类型,需要转换为int或bool)
deleted = spu_row.get('deleted', 0)
# 处理bit类型:可能是b'\x00'或b'\x01',或者直接是0/1
if isinstance(deleted, bytes):
return deleted == b'\x01' or deleted == 1
return bool(deleted)
|
5c2b70a2
tangwang
search_products.json
|
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
|
def _load_spus_for_spu_ids(self, tenant_id: str, spu_ids: List[str], include_deleted: bool = True) -> pd.DataFrame:
"""Batch load SPU rows for a list of spu_ids using IN (...)"""
spu_ids_int = self._normalize_spu_ids(spu_ids)
if not spu_ids_int:
return pd.DataFrame()
if include_deleted:
query = text(
"""
SELECT
id, shop_id, shoplazza_id, title, brief, description,
spu, vendor, vendor_url,
image_src, image_width, image_height, image_path, image_alt,
tags, note, category, category_id, category_google_id,
category_level, category_path,
|
89638140
tangwang
重构 indexer 文档构建接口...
|
294
|
fake_sales, display_fake_sales,
|
5c2b70a2
tangwang
search_products.json
|
295
296
297
298
299
300
301
302
303
304
305
306
307
308
|
tenant_id, creator, create_time, updater, update_time, deleted
FROM shoplazza_product_spu
WHERE tenant_id = :tenant_id AND id IN :spu_ids
"""
).bindparams(bindparam("spu_ids", expanding=True))
else:
query = text(
"""
SELECT
id, shop_id, shoplazza_id, title, brief, description,
spu, vendor, vendor_url,
image_src, image_width, image_height, image_path, image_alt,
tags, note, category, category_id, category_google_id,
category_level, category_path,
|
89638140
tangwang
重构 indexer 文档构建接口...
|
309
|
fake_sales, display_fake_sales,
|
5c2b70a2
tangwang
search_products.json
|
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
|
tenant_id, creator, create_time, updater, update_time, deleted
FROM shoplazza_product_spu
WHERE tenant_id = :tenant_id AND deleted = 0 AND id IN :spu_ids
"""
).bindparams(bindparam("spu_ids", expanding=True))
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_ids": spu_ids_int})
return df
def _load_skus_for_spu_ids(self, tenant_id: str, spu_ids: List[str]) -> pd.DataFrame:
"""Batch load all SKUs for a list of spu_ids"""
spu_ids_int = self._normalize_spu_ids(spu_ids)
if not spu_ids_int:
return pd.DataFrame()
query = text(
"""
SELECT
id, spu_id, shop_id, shoplazza_id, shoplazza_product_id,
shoplazza_image_id, title, sku, barcode, position,
price, compare_at_price, cost_price,
option1, option2, option3,
inventory_quantity, weight, weight_unit, image_src,
wholesale_price, note, extend,
shoplazza_created_at, shoplazza_updated_at, tenant_id,
creator, create_time, updater, update_time, deleted
FROM shoplazza_product_sku
WHERE tenant_id = :tenant_id AND deleted = 0 AND spu_id IN :spu_ids
"""
).bindparams(bindparam("spu_ids", expanding=True))
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_ids": spu_ids_int})
return df
def _load_options_for_spu_ids(self, tenant_id: str, spu_ids: List[str]) -> pd.DataFrame:
"""Batch load all options for a list of spu_ids"""
spu_ids_int = self._normalize_spu_ids(spu_ids)
if not spu_ids_int:
return pd.DataFrame()
query = text(
"""
SELECT
id, spu_id, shop_id, shoplazza_id, shoplazza_product_id,
position, name, `values`, tenant_id,
creator, create_time, updater, update_time, deleted
FROM shoplazza_product_option
WHERE tenant_id = :tenant_id AND deleted = 0 AND spu_id IN :spu_ids
ORDER BY spu_id, position
"""
).bindparams(bindparam("spu_ids", expanding=True))
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_ids": spu_ids_int})
return df
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
367
|
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
368
|
def _delete_spu_from_es(
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
369
370
371
|
self,
es_client,
tenant_id: str,
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
372
373
374
|
spu_id: str,
index_name: str,
log_prefix: str = ""
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
375
376
|
) -> Dict[str, Any]:
"""
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
377
|
从ES中删除单个SPU文档(通用方法)
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
378
379
|
Returns:
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
380
|
{"status": "deleted|not_found|failed", "msg": "错误信息(可选)"}
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
381
|
"""
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
|
try:
response = es_client.client.delete(
index=index_name,
id=str(spu_id),
ignore=[404]
)
result = response.get('result')
if result == 'deleted':
log_spu_processing(indexer_logger, tenant_id, spu_id, 'deleted', log_prefix)
return {"status": "deleted"}
elif result == 'not_found':
return {"status": "not_found"}
else:
msg = f"Unexpected result: {result}"
log_spu_processing(indexer_logger, tenant_id, spu_id, 'delete_failed', msg)
return {"status": "failed", "msg": msg}
except Exception as e:
if hasattr(e, 'status_code') and e.status_code == 404:
return {"status": "not_found"}
else:
msg = str(e)
logger.error(f"[IncrementalDeletion] Error deleting SPU {spu_id}: {e}", exc_info=True)
log_spu_processing(indexer_logger, tenant_id, spu_id, 'delete_failed', msg)
return {"status": "failed", "msg": msg}
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
408
409
|
def _load_skus_for_spu(self, tenant_id: str, spu_id: str) -> pd.DataFrame:
|
3c1f8031
tangwang
api/routes/indexe...
|
410
|
"""加载指定SPU的所有SKU数据"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
|
query = text("""
SELECT
id, spu_id, shop_id, shoplazza_id, shoplazza_product_id,
shoplazza_image_id, title, sku, barcode, position,
price, compare_at_price, cost_price,
option1, option2, option3,
inventory_quantity, weight, weight_unit, image_src,
wholesale_price, note, extend,
shoplazza_created_at, shoplazza_updated_at, tenant_id,
creator, create_time, updater, update_time, deleted
FROM shoplazza_product_sku
WHERE tenant_id = :tenant_id AND spu_id = :spu_id AND deleted = 0
""")
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_id": spu_id})
return df
def _load_options_for_spu(self, tenant_id: str, spu_id: str) -> pd.DataFrame:
|
3c1f8031
tangwang
api/routes/indexe...
|
431
|
"""加载指定SPU的所有Option数据"""
|
0064e946
tangwang
feat: 增量索引服务、租户配置...
|
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
|
query = text("""
SELECT
id, spu_id, shop_id, shoplazza_id, shoplazza_product_id,
position, name, `values`, tenant_id,
creator, create_time, updater, update_time, deleted
FROM shoplazza_product_option
WHERE tenant_id = :tenant_id AND spu_id = :spu_id AND deleted = 0
ORDER BY position
""")
with self.db_engine.connect() as conn:
df = pd.read_sql(query, conn, params={"tenant_id": tenant_id, "spu_id": spu_id})
return df
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
447
448
449
450
451
|
def index_spus_to_es(
self,
es_client,
tenant_id: str,
spu_ids: List[str],
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
452
|
index_name: str = None,
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
453
454
|
batch_size: int = 100,
delete_spu_ids: List[str] = None
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
455
456
457
458
|
) -> Dict[str, Any]:
"""
批量索引SPU到ES(增量索引)
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
459
460
461
462
|
支持两种删除方式:
1. 自动检测删除:根据数据库deleted字段自动检测并删除ES中的文档
2. 显式删除:通过delete_spu_ids参数显式指定要删除的SPU
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
463
464
465
|
Args:
es_client: Elasticsearch客户端
tenant_id: 租户ID
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
466
|
spu_ids: SPU ID列表(要索引的)
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
467
|
index_name: 索引名称(可选,如果不提供则根据tenant_id自动生成)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
468
|
batch_size: 批量写入ES的批次大小
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
469
|
delete_spu_ids: 显式指定要删除的SPU ID列表(可选)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
470
471
|
Returns:
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
472
|
包含成功/失败列表的字典,以及删除结果
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
473
|
"""
|
e4a39cc8
tangwang
索引隔离。 不同的tenant_i...
|
474
475
476
|
# Generate tenant-specific index name if not provided
if index_name is None:
index_name = get_tenant_index_name(tenant_id)
|
5c2b70a2
tangwang
search_products.json
|
477
478
479
480
|
# 去重但保持顺序(避免重复DB/翻译/embedding/写ES)
if spu_ids:
spu_ids = list(dict.fromkeys(spu_ids))
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
481
482
|
start_time = time.time()
total_count = len(spu_ids)
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
483
484
485
486
487
488
489
|
delete_count = len(delete_spu_ids) if delete_spu_ids else 0
# spu_ids 对应的响应列表(状态:indexed, deleted, failed)
spu_results = []
# delete_spu_ids 对应的响应列表(状态:deleted, not_found, failed)
delete_results = []
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
490
|
documents = []
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
491
492
493
494
495
496
497
498
|
# 记录请求开始
log_index_request(
indexer_logger,
index_type='incremental',
tenant_id=tenant_id,
request_params={
'spu_count': total_count,
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
499
|
'delete_count': delete_count,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
500
501
502
503
504
|
'index_name': index_name,
'batch_size': batch_size
}
)
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
505
506
|
logger.info(
f"[IncrementalIndexing] Starting bulk index for tenant_id={tenant_id}, "
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
507
|
f"spu_count={total_count}, delete_count={delete_count}"
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
508
|
)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
509
|
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
510
|
# 步骤0: 处理显式删除请求(delete_spu_ids)
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
511
512
|
if delete_spu_ids:
logger.info(f"[IncrementalIndexing] Processing explicit deletions: {len(delete_spu_ids)} SPUs")
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
513
514
515
|
for spu_id in delete_spu_ids:
result = self._delete_spu_from_es(es_client, tenant_id, spu_id, index_name, "explicit")
delete_results.append({"spu_id": spu_id, **result})
|
f54b3854
tangwang
pu_ids参数。目前总共3个参数:
|
516
|
|
5c2b70a2
tangwang
search_products.json
|
517
518
519
520
521
522
523
524
525
526
527
|
# 步骤1: 批量获取SPU/SKU/Option数据,并自动检测删除
if spu_ids:
log_spu_processing(indexer_logger, tenant_id, ",".join(spu_ids[:10]), 'fetching')
# 批量加载SPU(包含deleted字段,用于判断删除)
spu_df = self._load_spus_for_spu_ids(tenant_id, spu_ids, include_deleted=True)
if spu_df.empty:
# 所有SPU都不存在,按“需要删除”处理
for spu_id in spu_ids:
logger.info(f"[IncrementalIndexing] SPU {spu_id} not found in DB, removing from ES")
result = self._delete_spu_from_es(es_client, tenant_id, spu_id, index_name, "auto_missing")
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
528
529
530
531
532
533
|
status = "deleted" if result["status"] != "failed" else "failed"
spu_results.append({
"spu_id": spu_id,
"status": status,
**({"msg": result["msg"]} if status == "failed" else {})
})
|
5c2b70a2
tangwang
search_products.json
|
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
|
else:
# 建立索引:id -> row
spu_df = spu_df.copy()
# Normalize deleted column to bool
def _is_deleted_value(v: Any) -> bool:
if isinstance(v, bytes):
return v == b"\x01" or v == 1
return bool(v)
spu_df["_is_deleted"] = spu_df["deleted"].apply(_is_deleted_value)
spu_df.set_index("id", inplace=True, drop=False)
found_ids = set(int(x) for x in spu_df.index.tolist())
requested_ids_int = set(self._normalize_spu_ids(spu_ids))
missing_ids_int = requested_ids_int - found_ids
# missing -> delete from ES
for missing_id in sorted(missing_ids_int):
spu_id_str = str(missing_id)
logger.info(f"[IncrementalIndexing] SPU {spu_id_str} not found in DB, removing from ES")
result = self._delete_spu_from_es(es_client, tenant_id, spu_id_str, index_name, "auto_missing")
status = "deleted" if result["status"] != "failed" else "failed"
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
556
|
spu_results.append({
|
5c2b70a2
tangwang
search_products.json
|
557
558
559
|
"spu_id": spu_id_str,
"status": status,
**({"msg": result["msg"]} if status == "failed" else {})
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
560
|
})
|
5c2b70a2
tangwang
search_products.json
|
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
|
# deleted -> delete from ES
deleted_rows = spu_df[spu_df["_is_deleted"]]
for _, row in deleted_rows.iterrows():
spu_id_str = str(int(row["id"]))
logger.info(f"[IncrementalIndexing] SPU {spu_id_str} is deleted in DB, removing from ES")
result = self._delete_spu_from_es(es_client, tenant_id, spu_id_str, index_name, "auto")
status = "deleted" if result["status"] != "failed" else "failed"
spu_results.append({
"spu_id": spu_id_str,
"status": status,
**({"msg": result["msg"]} if status == "failed" else {})
})
# active -> batch load sku/option then transform
active_spu_df = spu_df[~spu_df["_is_deleted"]]
active_ids_str = [str(int(x)) for x in active_spu_df["id"].tolist()]
skus_df = self._load_skus_for_spu_ids(tenant_id, active_ids_str)
options_df = self._load_options_for_spu_ids(tenant_id, active_ids_str)
sku_groups = skus_df.groupby("spu_id") if not skus_df.empty else None
option_groups = options_df.groupby("spu_id") if not options_df.empty else None
transformer, encoder, enable_embedding = self._get_transformer_bundle(tenant_id)
# 按输入顺序处理 active SPUs
|
5c2b70a2
tangwang
search_products.json
|
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
|
for spu_id in spu_ids:
try:
spu_id_int = int(spu_id)
except Exception:
continue
if spu_id_int not in active_spu_df.index:
continue
log_spu_processing(indexer_logger, tenant_id, spu_id, 'transforming')
spu_row = active_spu_df.loc[spu_id_int]
skus_for_spu = sku_groups.get_group(spu_id_int) if sku_groups is not None and spu_id_int in sku_groups.groups else pd.DataFrame()
opts_for_spu = option_groups.get_group(spu_id_int) if option_groups is not None and spu_id_int in option_groups.groups else pd.DataFrame()
doc = transformer.transform_spu_to_doc(
tenant_id=tenant_id,
spu_row=spu_row,
skus=skus_for_spu,
options=opts_for_spu,
|
5c2b70a2
tangwang
search_products.json
|
605
606
607
608
609
610
611
612
|
)
if doc is None:
error_msg = "SPU transform returned None"
log_spu_processing(indexer_logger, tenant_id, spu_id, 'failed', error_msg)
spu_results.append({"spu_id": spu_id, "status": "failed", "msg": error_msg})
continue
documents.append((spu_id, doc))
|
5c2b70a2
tangwang
search_products.json
|
613
614
615
616
617
618
|
# 批量生成 embedding(保持翻译逻辑不变;embedding 走缓存)
if enable_embedding and encoder and documents:
title_texts: List[str] = []
title_doc_indices: List[int] = []
for i, (_, doc) in enumerate(documents):
|
d7d48f52
tangwang
改动(mapping + 灌入结构)
|
619
620
621
622
623
624
625
626
627
|
title_obj = doc.get("title") or {}
title_text = None
if isinstance(title_obj, dict):
title_text = title_obj.get("en") or title_obj.get("zh")
if not title_text:
for v in title_obj.values():
if v and str(v).strip():
title_text = str(v)
break
|
5c2b70a2
tangwang
search_products.json
|
628
629
630
631
632
|
if title_text and str(title_text).strip():
title_texts.append(str(title_text))
title_doc_indices.append(i)
if title_texts:
|
77516841
tangwang
tidy embeddings
|
633
|
embeddings = encoder.encode(title_texts, batch_size=32)
|
ed948666
tangwang
tidy
|
634
635
636
637
638
639
640
641
642
643
644
645
646
|
if embeddings is None or len(embeddings) != len(title_texts):
raise RuntimeError(
f"[IncrementalIndexing] Batch embedding length mismatch for tenant_id={tenant_id}: "
f"expected {len(title_texts)}, got {0 if embeddings is None else len(embeddings)}"
)
for j, emb in enumerate(embeddings):
vec = np.asarray(emb, dtype=np.float32)
if vec.ndim != 1 or vec.size == 0 or not np.isfinite(vec).all():
raise RuntimeError(
f"[IncrementalIndexing] Invalid title embedding in batch for tenant_id={tenant_id}, index={j}"
)
doc_idx = title_doc_indices[j]
documents[doc_idx][1]["title_embedding"] = vec.tolist()
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
647
648
649
650
651
652
|
logger.info(f"[IncrementalIndexing] Transformed {len(documents)}/{total_count} documents")
# 步骤2: 批量写入ES
if documents:
try:
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
653
654
655
|
# 提取doc列表用于批量写入
doc_list = [doc for _, doc in documents]
logger.info(f"[IncrementalIndexing] Indexing {len(doc_list)} documents to ES (batch_size={batch_size})")
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
656
657
|
indexer = BulkIndexer(es_client, index_name, batch_size=batch_size, max_retries=3)
bulk_results = indexer.index_documents(
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
658
|
doc_list,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
659
660
661
662
|
id_field="spu_id",
show_progress=False
)
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
663
|
# 根据ES返回的结果更新spu_results
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
664
665
666
|
es_success_count = bulk_results.get('success', 0)
es_failed_count = bulk_results.get('failed', 0)
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
667
|
# 由于BulkIndexer返回的是总体统计,我们假设:
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
668
669
|
# - 如果ES返回成功数等于文档数,则所有文档都成功
# - 否则,失败的文档可能在ES错误信息中,但我们无法精确映射
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
670
|
# 这里采用简化处理:将成功写入ES的文档标记为indexed
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
671
672
|
if es_failed_count == 0:
# 全部成功
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
673
674
675
|
for spu_id, doc in documents:
spu_results.append({
"spu_id": spu_id,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
676
677
678
679
|
"status": "indexed"
})
else:
# 有失败的情况,我们标记已处理的文档为成功,未处理的可能失败
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
680
|
logger.warning(f"[IncrementalIndexing] ES bulk index had {es_failed_count} failures")
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
681
|
for spu_id, doc in documents:
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
682
|
# 由于无法精确知道哪些失败,我们假设全部成功(实际应该改进)
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
683
684
|
spu_results.append({
"spu_id": spu_id,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
685
686
687
|
"status": "indexed"
})
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
688
|
# 如果有ES错误,记录日志
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
689
690
691
692
693
694
695
|
if bulk_results.get('errors'):
logger.error(f"[IncrementalIndexing] ES errors: {bulk_results['errors'][:5]}")
except Exception as e:
error_msg = f"ES bulk index failed: {str(e)}"
logger.error(f"[IncrementalIndexing] {error_msg}", exc_info=True)
# 所有文档都失败
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
696
697
698
699
700
701
702
703
704
705
706
707
708
|
for spu_id, doc in documents:
# 检查是否已经在spu_results中(可能之前已经标记为failed)
existing = next((r for r in spu_results if r.get('spu_id') == spu_id), None)
if existing:
# 如果已存在,更新状态
existing['status'] = 'failed'
existing['msg'] = error_msg
else:
spu_results.append({
"spu_id": spu_id,
"status": "failed",
"msg": error_msg
})
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
709
710
711
712
|
else:
logger.warning(f"[IncrementalIndexing] No documents to index for tenant_id={tenant_id}")
elapsed_time = time.time() - start_time
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
713
|
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
714
715
716
717
718
719
720
|
# 统计结果(简化)
total_processed = total_count + delete_count
total_success = len([r for r in spu_results + delete_results if r.get('status') in ('indexed', 'deleted', 'not_found')])
total_failed = len([r for r in spu_results + delete_results if r.get('status') == 'failed'])
# 记录最终结果
deleted_count = len([r for r in spu_results + delete_results if r.get('status') == 'deleted'])
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
721
722
723
724
|
log_index_result(
indexer_logger,
index_type='incremental',
tenant_id=tenant_id,
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
725
726
727
|
total_count=total_processed,
success_count=total_success,
failed_count=total_failed,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
728
729
|
elapsed_time=elapsed_time,
index_name=index_name,
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
730
731
|
errors=[r.get('msg') for r in spu_results + delete_results if r.get('status') == 'failed'][:10],
deleted_count=deleted_count
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
732
733
|
)
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
734
735
|
logger.info(
f"[IncrementalIndexing] Completed for tenant_id={tenant_id}: "
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
736
|
f"total={total_processed}, success={total_success}, failed={total_failed}, "
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
737
738
739
740
|
f"elapsed={elapsed_time:.2f}s"
)
return {
|
c797ba2b
tangwang
1. 增量索引接口,增加删除操作后...
|
741
742
743
744
745
|
"spu_ids": spu_results, # spu_ids对应的响应列表
"delete_spu_ids": delete_results, # delete_spu_ids对应的响应列表
"total": total_processed,
"success_count": total_success,
"failed_count": total_failed,
|
c55c5e47
tangwang
feat: 新增增量索引接口并重构...
|
746
747
748
749
|
"elapsed_time": elapsed_time,
"index_name": index_name,
"tenant_id": tenant_id
}
|