6f7840cf
tangwang
refactor: rename ...
|
1
2
3
4
5
6
7
8
9
10
11
|
#!/usr/bin/env python3
"""
商品内容理解与属性补充模块(product_enrich)
提供基于 LLM 的商品锚文本 / 语义属性 / 标签等分析能力,
供 indexer 与 API 在内存中调用(不再负责 CSV 读写)。
"""
import os
import json
import logging
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
12
|
import re
|
6f7840cf
tangwang
refactor: rename ...
|
13
14
|
import time
import hashlib
|
41f0b2e9
tangwang
product_enrich支持并发
|
15
16
|
import uuid
import threading
|
36516857
tangwang
feat(product_enri...
|
17
|
from dataclasses import dataclass, field
|
a73a751f
tangwang
enrich
|
18
|
from collections import OrderedDict
|
6f7840cf
tangwang
refactor: rename ...
|
19
|
from datetime import datetime
|
41f0b2e9
tangwang
product_enrich支持并发
|
20
|
from concurrent.futures import ThreadPoolExecutor
|
048631be
tangwang
1. 新增说明文档《product...
|
21
|
from typing import List, Dict, Tuple, Any, Optional, FrozenSet
|
6f7840cf
tangwang
refactor: rename ...
|
22
23
24
25
26
|
import redis
import requests
from pathlib import Path
|
86d8358b
tangwang
config optimize
|
27
|
from config.loader import get_app_config
|
6f7840cf
tangwang
refactor: rename ...
|
28
|
from config.tenant_config_loader import SOURCE_LANG_CODE_MAP
|
a73a751f
tangwang
enrich
|
29
30
31
32
33
|
from indexer.product_enrich_prompts import (
SYSTEM_MESSAGE,
USER_INSTRUCTION_TEMPLATE,
LANGUAGE_MARKDOWN_TABLE_HEADERS,
SHARED_ANALYSIS_INSTRUCTION,
|
dabd52a5
tangwang
feat(indexer): 支持...
|
34
|
CATEGORY_TAXONOMY_PROFILES,
|
a73a751f
tangwang
enrich
|
35
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
36
37
38
|
# 配置
BATCH_SIZE = 20
|
41f0b2e9
tangwang
product_enrich支持并发
|
39
40
41
|
# enrich-content LLM 批次并发 worker 上限(线程池;仅对 uncached batch 并发)
_APP_CONFIG = get_app_config()
CONTENT_UNDERSTANDING_MAX_WORKERS = int(_APP_CONFIG.product_enrich.max_workers)
|
6f7840cf
tangwang
refactor: rename ...
|
42
43
44
45
46
47
48
49
50
|
# 华北2(北京):https://dashscope.aliyuncs.com/compatible-mode/v1
# 新加坡:https://dashscope-intl.aliyuncs.com/compatible-mode/v1
# 美国(弗吉尼亚):https://dashscope-us.aliyuncs.com/compatible-mode/v1
API_BASE_URL = "https://dashscope-us.aliyuncs.com/compatible-mode/v1"
MODEL_NAME = "qwen-flash"
API_KEY = os.environ.get("DASHSCOPE_API_KEY")
MAX_RETRIES = 3
RETRY_DELAY = 5 # 秒
REQUEST_TIMEOUT = 180 # 秒
|
a73a751f
tangwang
enrich
|
51
|
LOGGED_SHARED_CONTEXT_CACHE_SIZE = 256
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
52
53
54
55
|
PROMPT_INPUT_MIN_ZH_CHARS = 20
PROMPT_INPUT_MAX_ZH_CHARS = 100
PROMPT_INPUT_MIN_WORDS = 16
PROMPT_INPUT_MAX_WORDS = 80
|
6f7840cf
tangwang
refactor: rename ...
|
56
57
58
59
60
61
62
63
64
65
|
# 日志路径
OUTPUT_DIR = Path("output_logs")
LOG_DIR = OUTPUT_DIR / "logs"
# 设置独立日志(不影响全局 indexer.log)
LOG_DIR.mkdir(parents=True, exist_ok=True)
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
log_file = LOG_DIR / f"product_enrich_{timestamp}.log"
verbose_log_file = LOG_DIR / "product_enrich_verbose.log"
|
a73a751f
tangwang
enrich
|
66
|
_logged_shared_context_keys: "OrderedDict[str, None]" = OrderedDict()
|
41f0b2e9
tangwang
product_enrich支持并发
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
_logged_shared_context_lock = threading.Lock()
_content_understanding_executor: Optional[ThreadPoolExecutor] = None
_content_understanding_executor_lock = threading.Lock()
def _get_content_understanding_executor() -> ThreadPoolExecutor:
"""
使用模块级单例线程池,避免同一进程内多次请求叠加创建线程池导致并发失控。
"""
global _content_understanding_executor
with _content_understanding_executor_lock:
if _content_understanding_executor is None:
_content_understanding_executor = ThreadPoolExecutor(
max_workers=CONTENT_UNDERSTANDING_MAX_WORKERS,
thread_name_prefix="product-enrich-llm",
)
return _content_understanding_executor
|
6f7840cf
tangwang
refactor: rename ...
|
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
# 主日志 logger:执行流程、批次信息等
logger = logging.getLogger("product_enrich")
logger.setLevel(logging.INFO)
if not logger.handlers:
formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
file_handler = logging.FileHandler(log_file, encoding="utf-8")
file_handler.setFormatter(formatter)
stream_handler = logging.StreamHandler()
stream_handler.setFormatter(formatter)
logger.addHandler(file_handler)
logger.addHandler(stream_handler)
# 避免日志向根 logger 传播,防止写入 logs/indexer.log 等其他文件
logger.propagate = False
# 详尽日志 logger:专门记录 LLM 请求与响应
verbose_logger = logging.getLogger("product_enrich_verbose")
verbose_logger.setLevel(logging.INFO)
if not verbose_logger.handlers:
verbose_formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(message)s")
verbose_file_handler = logging.FileHandler(verbose_log_file, encoding="utf-8")
verbose_file_handler.setFormatter(verbose_formatter)
verbose_logger.addHandler(verbose_file_handler)
verbose_logger.propagate = False
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
116
117
|
logger.info("Verbose LLM logs are written to: %s", verbose_log_file)
|
6f7840cf
tangwang
refactor: rename ...
|
118
119
|
# Redis 缓存(用于 anchors / 语义属性)
|
41f0b2e9
tangwang
product_enrich支持并发
|
120
|
_REDIS_CONFIG = _APP_CONFIG.infrastructure.redis
|
86d8358b
tangwang
config optimize
|
121
122
|
ANCHOR_CACHE_PREFIX = _REDIS_CONFIG.anchor_cache_prefix
ANCHOR_CACHE_EXPIRE_DAYS = int(_REDIS_CONFIG.anchor_cache_expire_days)
|
6f7840cf
tangwang
refactor: rename ...
|
123
124
125
126
|
_anchor_redis: Optional[redis.Redis] = None
try:
_anchor_redis = redis.Redis(
|
86d8358b
tangwang
config optimize
|
127
128
129
|
host=_REDIS_CONFIG.host,
port=_REDIS_CONFIG.port,
password=_REDIS_CONFIG.password,
|
6f7840cf
tangwang
refactor: rename ...
|
130
|
decode_responses=True,
|
86d8358b
tangwang
config optimize
|
131
132
133
|
socket_timeout=_REDIS_CONFIG.socket_timeout,
socket_connect_timeout=_REDIS_CONFIG.socket_connect_timeout,
retry_on_timeout=_REDIS_CONFIG.retry_on_timeout,
|
6f7840cf
tangwang
refactor: rename ...
|
134
135
136
137
138
139
140
141
|
health_check_interval=10,
)
_anchor_redis.ping()
logger.info("Redis cache initialized for product anchors and semantic attributes")
except Exception as e:
logger.warning(f"Failed to initialize Redis for anchors cache: {e}")
_anchor_redis = None
|
a73a751f
tangwang
enrich
|
142
143
144
145
146
|
_missing_prompt_langs = sorted(set(SOURCE_LANG_CODE_MAP) - set(LANGUAGE_MARKDOWN_TABLE_HEADERS))
if _missing_prompt_langs:
raise RuntimeError(
f"Missing product_enrich prompt config for languages: {_missing_prompt_langs}"
)
|
6f7840cf
tangwang
refactor: rename ...
|
147
148
|
|
048631be
tangwang
1. 新增说明文档《product...
|
149
|
# 多值字段分隔
|
69881ecb
tangwang
相关性调参、enrich内容解析优化
|
150
|
_MULTI_VALUE_FIELD_SPLIT_RE = re.compile(r"[,、,;|/\n\t]+")
|
048631be
tangwang
1. 新增说明文档《product...
|
151
152
153
154
155
156
157
158
159
160
161
162
163
164
|
# 表格单元格中视为「无内容」的占位
_MARKDOWN_EMPTY_CELL_LITERALS: Tuple[str, ...] = ("-","–", "—", "none", "null", "n/a", "无")
_MARKDOWN_EMPTY_CELL_TOKENS_CF: FrozenSet[str] = frozenset(
lit.casefold() for lit in _MARKDOWN_EMPTY_CELL_LITERALS
)
def _normalize_markdown_table_cell(raw: Optional[str]) -> str:
"""strip;将占位符统一视为空字符串。"""
s = str(raw or "").strip()
if not s:
return ""
if s.casefold() in _MARKDOWN_EMPTY_CELL_TOKENS_CF:
return ""
return s
|
d350861f
tangwang
索引结构修改
|
165
|
_CORE_INDEX_LANGUAGES = ("zh", "en")
|
2703b6ea
tangwang
refactor(indexer)...
|
166
167
|
_DEFAULT_ENRICHMENT_SCOPES = ("generic", "category_taxonomy")
_DEFAULT_CATEGORY_TAXONOMY_PROFILE = "apparel"
|
36516857
tangwang
feat(product_enri...
|
168
|
_CONTENT_ANALYSIS_ATTRIBUTE_FIELD_MAP = (
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
169
170
171
172
173
174
175
176
|
("tags", "enriched_tags"),
("target_audience", "target_audience"),
("usage_scene", "usage_scene"),
("season", "season"),
("key_attributes", "key_attributes"),
("material", "material"),
("features", "features"),
)
|
36516857
tangwang
feat(product_enri...
|
177
|
_CONTENT_ANALYSIS_RESULT_FIELDS = (
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
178
179
180
181
182
183
184
185
186
187
188
|
"title",
"category_path",
"tags",
"target_audience",
"usage_scene",
"season",
"key_attributes",
"material",
"features",
"anchor_text",
)
|
36516857
tangwang
feat(product_enri...
|
189
|
_CONTENT_ANALYSIS_MEANINGFUL_FIELDS = (
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
190
|
"tags",
|
d350861f
tangwang
索引结构修改
|
191
192
193
194
195
196
|
"target_audience",
"usage_scene",
"season",
"key_attributes",
"material",
"features",
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
197
|
"anchor_text",
|
d350861f
tangwang
索引结构修改
|
198
|
)
|
36516857
tangwang
feat(product_enri...
|
199
|
_CONTENT_ANALYSIS_FIELD_ALIASES = {
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
200
201
|
"tags": ("tags", "enriched_tags"),
}
|
36516857
tangwang
feat(product_enri...
|
202
|
_CONTENT_ANALYSIS_QUALITY_FIELDS = ("title", "category_path", "anchor_text")
|
36516857
tangwang
feat(product_enri...
|
203
204
205
206
207
208
209
210
211
|
@dataclass(frozen=True)
class AnalysisSchema:
name: str
shared_instruction: str
markdown_table_headers: Dict[str, List[str]]
result_fields: Tuple[str, ...]
meaningful_fields: Tuple[str, ...]
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
212
|
cache_version: str = "v1"
|
36516857
tangwang
feat(product_enri...
|
213
|
field_aliases: Dict[str, Tuple[str, ...]] = field(default_factory=dict)
|
36516857
tangwang
feat(product_enri...
|
214
215
216
|
quality_fields: Tuple[str, ...] = ()
def get_headers(self, target_lang: str) -> Optional[List[str]]:
|
048631be
tangwang
1. 新增说明文档《product...
|
217
|
return self.markdown_table_headers.get(target_lang)
|
36516857
tangwang
feat(product_enri...
|
218
219
220
221
222
223
224
225
226
|
_ANALYSIS_SCHEMAS: Dict[str, AnalysisSchema] = {
"content": AnalysisSchema(
name="content",
shared_instruction=SHARED_ANALYSIS_INSTRUCTION,
markdown_table_headers=LANGUAGE_MARKDOWN_TABLE_HEADERS,
result_fields=_CONTENT_ANALYSIS_RESULT_FIELDS,
meaningful_fields=_CONTENT_ANALYSIS_MEANINGFUL_FIELDS,
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
227
|
cache_version="v2",
|
36516857
tangwang
feat(product_enri...
|
228
229
230
|
field_aliases=_CONTENT_ANALYSIS_FIELD_ALIASES,
quality_fields=_CONTENT_ANALYSIS_QUALITY_FIELDS,
),
|
2703b6ea
tangwang
refactor(indexer)...
|
231
232
|
}
|
dabd52a5
tangwang
feat(indexer): 支持...
|
233
|
def _build_taxonomy_profile_schema(profile: str, config: Dict[str, Any]) -> AnalysisSchema:
|
dabd52a5
tangwang
feat(indexer): 支持...
|
234
235
236
|
return AnalysisSchema(
name=f"taxonomy:{profile}",
shared_instruction=config["shared_instruction"],
|
048631be
tangwang
1. 新增说明文档《product...
|
237
238
239
|
markdown_table_headers=config["markdown_table_headers"],
result_fields=tuple(field["key"] for field in config["fields"]),
meaningful_fields=tuple(field["key"] for field in config["fields"]),
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
240
|
cache_version="v1",
|
dabd52a5
tangwang
feat(indexer): 支持...
|
241
242
243
244
245
246
|
)
_CATEGORY_TAXONOMY_PROFILE_SCHEMAS: Dict[str, AnalysisSchema] = {
profile: _build_taxonomy_profile_schema(profile, config)
for profile, config in CATEGORY_TAXONOMY_PROFILES.items()
|
36516857
tangwang
feat(product_enri...
|
247
248
|
}
|
2703b6ea
tangwang
refactor(indexer)...
|
249
|
_CATEGORY_TAXONOMY_PROFILE_ATTRIBUTE_FIELD_MAPS: Dict[str, Tuple[Tuple[str, str], ...]] = {
|
dabd52a5
tangwang
feat(indexer): 支持...
|
250
251
|
profile: tuple((field["key"], field["label"]) for field in config["fields"])
for profile, config in CATEGORY_TAXONOMY_PROFILES.items()
|
2703b6ea
tangwang
refactor(indexer)...
|
252
253
|
}
|
36516857
tangwang
feat(product_enri...
|
254
|
|
dabd52a5
tangwang
feat(indexer): 支持...
|
255
256
257
258
|
def get_supported_category_taxonomy_profiles() -> Tuple[str, ...]:
return tuple(_CATEGORY_TAXONOMY_PROFILE_SCHEMAS.keys())
|
2703b6ea
tangwang
refactor(indexer)...
|
259
260
261
|
def _normalize_category_taxonomy_profile(category_taxonomy_profile: Optional[str] = None) -> str:
profile = str(category_taxonomy_profile or _DEFAULT_CATEGORY_TAXONOMY_PROFILE).strip()
if profile not in _CATEGORY_TAXONOMY_PROFILE_SCHEMAS:
|
dabd52a5
tangwang
feat(indexer): 支持...
|
262
263
264
265
|
supported = ", ".join(get_supported_category_taxonomy_profiles())
raise ValueError(
f"Unsupported category_taxonomy_profile: {profile}. Supported profiles: {supported}"
)
|
2703b6ea
tangwang
refactor(indexer)...
|
266
|
return profile
|
69881ecb
tangwang
相关性调参、enrich内容解析优化
|
267
268
|
|
2703b6ea
tangwang
refactor(indexer)...
|
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
def _get_analysis_schema(
analysis_kind: str,
*,
category_taxonomy_profile: Optional[str] = None,
) -> AnalysisSchema:
if analysis_kind == "content":
return _ANALYSIS_SCHEMAS["content"]
if analysis_kind == "taxonomy":
profile = _normalize_category_taxonomy_profile(category_taxonomy_profile)
return _CATEGORY_TAXONOMY_PROFILE_SCHEMAS[profile]
raise ValueError(f"Unsupported analysis_kind: {analysis_kind}")
def _get_taxonomy_attribute_field_map(
category_taxonomy_profile: Optional[str] = None,
) -> Tuple[Tuple[str, str], ...]:
profile = _normalize_category_taxonomy_profile(category_taxonomy_profile)
return _CATEGORY_TAXONOMY_PROFILE_ATTRIBUTE_FIELD_MAPS[profile]
|
2703b6ea
tangwang
refactor(indexer)...
|
289
290
|
def _normalize_enrichment_scopes(
enrichment_scopes: Optional[List[str]] = None,
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
291
|
) -> Tuple[str, ...]:
|
2703b6ea
tangwang
refactor(indexer)...
|
292
|
requested = _DEFAULT_ENRICHMENT_SCOPES if not enrichment_scopes else tuple(enrichment_scopes)
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
293
294
|
normalized: List[str] = []
seen = set()
|
2703b6ea
tangwang
refactor(indexer)...
|
295
296
297
298
299
|
for enrichment_scope in requested:
scope = str(enrichment_scope).strip()
if scope not in {"generic", "category_taxonomy"}:
raise ValueError(f"Unsupported enrichment_scope: {scope}")
if scope in seen:
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
300
|
continue
|
2703b6ea
tangwang
refactor(indexer)...
|
301
302
|
seen.add(scope)
normalized.append(scope)
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
303
304
305
|
return tuple(normalized)
|
69881ecb
tangwang
相关性调参、enrich内容解析优化
|
306
307
308
309
310
311
312
313
314
315
|
def split_multi_value_field(text: Optional[str]) -> List[str]:
"""将 LLM/业务中的多值字符串拆成短语列表(strip 后去空)。"""
if text is None:
return []
s = str(text).strip()
if not s:
return []
return [p.strip() for p in _MULTI_VALUE_FIELD_SPLIT_RE.split(s) if p.strip()]
|
d350861f
tangwang
索引结构修改
|
316
317
318
319
320
321
322
323
324
325
|
def _append_lang_phrase_map(target: Dict[str, List[str]], lang: str, raw_value: Any) -> None:
parts = split_multi_value_field(raw_value)
if not parts:
return
existing = target.get(lang) or []
merged = list(dict.fromkeys([str(x).strip() for x in existing if str(x).strip()] + parts))
if merged:
target[lang] = merged
|
80f1e036
tangwang
enriched_attribut...
|
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
|
def _get_or_create_named_value_entry(
target: List[Dict[str, Any]],
name: str,
*,
default_value: Optional[Dict[str, Any]] = None,
) -> Dict[str, Any]:
for item in target:
if item.get("name") == name:
value = item.get("value")
if isinstance(value, dict):
return item
break
entry = {"name": name, "value": default_value or {}}
target.append(entry)
return entry
def _append_named_lang_phrase_map(
|
d350861f
tangwang
索引结构修改
|
345
346
347
348
349
|
target: List[Dict[str, Any]],
name: str,
lang: str,
raw_value: Any,
) -> None:
|
80f1e036
tangwang
enriched_attribut...
|
350
351
|
entry = _get_or_create_named_value_entry(target, name=name, default_value={})
_append_lang_phrase_map(entry["value"], lang=lang, raw_value=raw_value)
|
d350861f
tangwang
索引结构修改
|
352
353
|
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
354
355
356
357
|
def _get_product_id(product: Dict[str, Any]) -> str:
return str(product.get("id") or product.get("spu_id") or "").strip()
|
36516857
tangwang
feat(product_enri...
|
358
359
|
def _get_analysis_field_aliases(field_name: str, schema: AnalysisSchema) -> Tuple[str, ...]:
return schema.field_aliases.get(field_name, (field_name,))
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
360
361
|
|
36516857
tangwang
feat(product_enri...
|
362
363
|
def _get_analysis_field_value(row: Dict[str, Any], field_name: str, schema: AnalysisSchema) -> Any:
for alias in _get_analysis_field_aliases(field_name, schema):
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
|
if alias in row:
return row.get(alias)
return None
def _has_meaningful_value(value: Any) -> bool:
if value is None:
return False
if isinstance(value, str):
return bool(value.strip())
if isinstance(value, dict):
return any(_has_meaningful_value(v) for v in value.values())
if isinstance(value, list):
return any(_has_meaningful_value(v) for v in value)
return bool(value)
def _make_empty_analysis_result(
product: Dict[str, Any],
target_lang: str,
|
36516857
tangwang
feat(product_enri...
|
384
|
schema: AnalysisSchema,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
385
386
387
388
389
390
391
|
error: Optional[str] = None,
) -> Dict[str, Any]:
result = {
"id": _get_product_id(product),
"lang": target_lang,
"title_input": str(product.get("title") or "").strip(),
}
|
36516857
tangwang
feat(product_enri...
|
392
|
for field in schema.result_fields:
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
393
394
395
396
397
398
399
400
401
402
|
result[field] = ""
if error:
result["error"] = error
return result
def _normalize_analysis_result(
result: Dict[str, Any],
product: Dict[str, Any],
target_lang: str,
|
36516857
tangwang
feat(product_enri...
|
403
|
schema: AnalysisSchema,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
404
|
) -> Dict[str, Any]:
|
36516857
tangwang
feat(product_enri...
|
405
|
normalized = _make_empty_analysis_result(product, target_lang, schema)
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
406
407
408
409
|
if not isinstance(result, dict):
return normalized
normalized["lang"] = str(result.get("lang") or target_lang).strip() or target_lang
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
410
411
412
413
|
normalized["title_input"] = str(
product.get("title") or result.get("title_input") or ""
).strip()
|
36516857
tangwang
feat(product_enri...
|
414
415
|
for field in schema.result_fields:
normalized[field] = str(_get_analysis_field_value(result, field, schema) or "").strip()
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
416
417
418
419
420
421
|
if result.get("error"):
normalized["error"] = str(result.get("error"))
return normalized
|
36516857
tangwang
feat(product_enri...
|
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
|
def _has_meaningful_analysis_content(result: Dict[str, Any], schema: AnalysisSchema) -> bool:
return any(_has_meaningful_value(result.get(field)) for field in schema.meaningful_fields)
def _append_analysis_attributes(
target: List[Dict[str, Any]],
row: Dict[str, Any],
lang: str,
schema: AnalysisSchema,
field_map: Tuple[Tuple[str, str], ...],
) -> None:
for source_name, output_name in field_map:
raw = _get_analysis_field_value(row, source_name, schema)
if not raw:
continue
_append_named_lang_phrase_map(
target,
name=output_name,
lang=lang,
raw_value=raw,
)
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
443
444
|
|
d350861f
tangwang
索引结构修改
|
445
446
447
448
|
def _apply_index_content_row(result: Dict[str, Any], row: Dict[str, Any], lang: str) -> None:
if not row or row.get("error"):
return
|
36516857
tangwang
feat(product_enri...
|
449
450
|
content_schema = _get_analysis_schema("content")
anchor_text = str(_get_analysis_field_value(row, "anchor_text", content_schema) or "").strip()
|
d350861f
tangwang
索引结构修改
|
451
452
453
|
if anchor_text:
_append_lang_phrase_map(result["qanchors"], lang=lang, raw_value=anchor_text)
|
36516857
tangwang
feat(product_enri...
|
454
455
|
for source_name, output_name in _CONTENT_ANALYSIS_ATTRIBUTE_FIELD_MAP:
raw = _get_analysis_field_value(row, source_name, content_schema)
|
d350861f
tangwang
索引结构修改
|
456
457
|
if not raw:
continue
|
80f1e036
tangwang
enriched_attribut...
|
458
|
_append_named_lang_phrase_map(
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
459
460
461
462
463
464
|
result["enriched_attributes"],
name=output_name,
lang=lang,
raw_value=raw,
)
if output_name == "enriched_tags":
|
d350861f
tangwang
索引结构修改
|
465
466
467
|
_append_lang_phrase_map(result["enriched_tags"], lang=lang, raw_value=raw)
|
2703b6ea
tangwang
refactor(indexer)...
|
468
469
470
471
472
473
474
|
def _apply_index_taxonomy_row(
result: Dict[str, Any],
row: Dict[str, Any],
lang: str,
*,
category_taxonomy_profile: Optional[str] = None,
) -> None:
|
36516857
tangwang
feat(product_enri...
|
475
476
477
478
479
480
481
|
if not row or row.get("error"):
return
_append_analysis_attributes(
result["enriched_taxonomy_attributes"],
row=row,
lang=lang,
|
2703b6ea
tangwang
refactor(indexer)...
|
482
483
484
485
486
|
schema=_get_analysis_schema(
"taxonomy",
category_taxonomy_profile=category_taxonomy_profile,
),
field_map=_get_taxonomy_attribute_field_map(category_taxonomy_profile),
|
36516857
tangwang
feat(product_enri...
|
487
488
489
|
)
|
d350861f
tangwang
索引结构修改
|
490
|
def _normalize_index_content_item(item: Dict[str, Any]) -> Dict[str, str]:
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
491
|
item_id = _get_product_id(item)
|
d350861f
tangwang
索引结构修改
|
492
493
494
495
496
497
|
return {
"id": item_id,
"title": str(item.get("title") or "").strip(),
"brief": str(item.get("brief") or "").strip(),
"description": str(item.get("description") or "").strip(),
"image_url": str(item.get("image_url") or "").strip(),
|
d350861f
tangwang
索引结构修改
|
498
499
500
501
502
503
|
}
def build_index_content_fields(
items: List[Dict[str, Any]],
tenant_id: Optional[str] = None,
|
2703b6ea
tangwang
refactor(indexer)...
|
504
505
|
enrichment_scopes: Optional[List[str]] = None,
category_taxonomy_profile: Optional[str] = None,
|
d350861f
tangwang
索引结构修改
|
506
507
508
509
510
511
512
513
|
) -> List[Dict[str, Any]]:
"""
高层入口:生成与 ES mapping 对齐的内容理解字段。
输入项需包含:
- `id` 或 `spu_id`
- `title`
- 可选 `brief` / `description` / `image_url`
|
2703b6ea
tangwang
refactor(indexer)...
|
514
|
- 可选 `enrichment_scopes`,默认同时执行 `generic` 与 `category_taxonomy`
|
048631be
tangwang
1. 新增说明文档《product...
|
515
|
- 可选 `category_taxonomy_profile`,默认 `apparel`
|
d350861f
tangwang
索引结构修改
|
516
517
518
519
520
521
|
返回项结构:
- `id`
- `qanchors`
- `enriched_tags`
- `enriched_attributes`
|
36516857
tangwang
feat(product_enri...
|
522
|
- `enriched_taxonomy_attributes`
|
d350861f
tangwang
索引结构修改
|
523
524
525
526
527
528
|
- 可选 `error`
其中:
- `qanchors.{lang}` 为短语数组
- `enriched_tags.{lang}` 为标签数组
"""
|
2703b6ea
tangwang
refactor(indexer)...
|
529
|
requested_enrichment_scopes = _normalize_enrichment_scopes(enrichment_scopes)
|
048631be
tangwang
1. 新增说明文档《product...
|
530
|
normalized_taxonomy_profile = _normalize_category_taxonomy_profile(category_taxonomy_profile)
|
d350861f
tangwang
索引结构修改
|
531
532
533
|
normalized_items = [_normalize_index_content_item(item) for item in items]
if not normalized_items:
return []
|
d350861f
tangwang
索引结构修改
|
534
535
536
537
538
539
540
|
results_by_id: Dict[str, Dict[str, Any]] = {
item["id"]: {
"id": item["id"],
"qanchors": {},
"enriched_tags": {},
"enriched_attributes": [],
|
36516857
tangwang
feat(product_enri...
|
541
|
"enriched_taxonomy_attributes": [],
|
d350861f
tangwang
索引结构修改
|
542
543
544
545
|
}
for item in normalized_items
}
|
048631be
tangwang
1. 新增说明文档《product...
|
546
|
for lang in _CORE_INDEX_LANGUAGES:
|
2703b6ea
tangwang
refactor(indexer)...
|
547
|
if "generic" in requested_enrichment_scopes:
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
548
549
550
551
552
553
554
|
try:
rows = analyze_products(
products=normalized_items,
target_lang=lang,
batch_size=BATCH_SIZE,
tenant_id=tenant_id,
analysis_kind="content",
|
048631be
tangwang
1. 新增说明文档《product...
|
555
|
category_taxonomy_profile=normalized_taxonomy_profile,
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
556
557
558
559
560
|
)
except Exception as e:
logger.warning("build_index_content_fields content enrichment failed for lang=%s: %s", lang, e)
for item in normalized_items:
results_by_id[item["id"]].setdefault("error", str(e))
|
d350861f
tangwang
索引结构修改
|
561
|
continue
|
36516857
tangwang
feat(product_enri...
|
562
|
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
563
564
565
566
567
568
569
570
571
|
for row in rows or []:
item_id = str(row.get("id") or "").strip()
if not item_id or item_id not in results_by_id:
continue
if row.get("error"):
results_by_id[item_id].setdefault("error", row["error"])
continue
_apply_index_content_row(results_by_id[item_id], row=row, lang=lang)
|
dabd52a5
tangwang
feat(indexer): 支持...
|
572
|
if "category_taxonomy" in requested_enrichment_scopes:
|
048631be
tangwang
1. 新增说明文档《product...
|
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
|
for lang in _CORE_INDEX_LANGUAGES:
try:
taxonomy_rows = analyze_products(
products=normalized_items,
target_lang=lang,
batch_size=BATCH_SIZE,
tenant_id=tenant_id,
analysis_kind="taxonomy",
category_taxonomy_profile=normalized_taxonomy_profile,
)
except Exception as e:
logger.warning(
"build_index_content_fields taxonomy enrichment failed for profile=%s lang=%s: %s",
normalized_taxonomy_profile,
lang,
e,
)
for item in normalized_items:
results_by_id[item["id"]].setdefault("error", str(e))
continue
|
dabd52a5
tangwang
feat(indexer): 支持...
|
593
|
|
048631be
tangwang
1. 新增说明文档《product...
|
594
595
596
597
598
599
600
601
602
603
604
605
606
|
for row in taxonomy_rows or []:
item_id = str(row.get("id") or "").strip()
if not item_id or item_id not in results_by_id:
continue
if row.get("error"):
results_by_id[item_id].setdefault("error", row["error"])
continue
_apply_index_taxonomy_row(
results_by_id[item_id],
row=row,
lang=lang,
category_taxonomy_profile=normalized_taxonomy_profile,
)
|
36516857
tangwang
feat(product_enri...
|
607
|
|
d350861f
tangwang
索引结构修改
|
608
609
610
|
return [results_by_id[item["id"]] for item in normalized_items]
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
|
def _normalize_space(text: str) -> str:
return re.sub(r"\s+", " ", (text or "").strip())
def _contains_cjk(text: str) -> bool:
return bool(re.search(r"[\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff]", text or ""))
def _truncate_by_chars(text: str, max_chars: int) -> str:
return text[:max_chars].strip()
def _truncate_by_words(text: str, max_words: int) -> str:
words = re.findall(r"\S+", text or "")
return " ".join(words[:max_words]).strip()
def _detect_prompt_input_lang(text: str) -> str:
# 简化处理:包含 CJK 时按中文类文本处理,否则统一按空格分词类语言处理。
return "zh" if _contains_cjk(text) else "en"
def _build_prompt_input_text(product: Dict[str, Any]) -> str:
"""
生成真正送入 prompt 的商品文本。
规则:
- 默认使用 title
- 若文本过短,则依次补 brief / description
- 若文本过长,则按语言粗粒度截断
"""
fields = [
_normalize_space(str(product.get("title") or "")),
_normalize_space(str(product.get("brief") or "")),
_normalize_space(str(product.get("description") or "")),
]
parts: List[str] = []
def join_parts() -> str:
return " | ".join(part for part in parts if part).strip()
for field in fields:
if not field:
continue
if field not in parts:
parts.append(field)
candidate = join_parts()
if _detect_prompt_input_lang(candidate) == "zh":
if len(candidate) >= PROMPT_INPUT_MIN_ZH_CHARS:
return _truncate_by_chars(candidate, PROMPT_INPUT_MAX_ZH_CHARS)
else:
if len(re.findall(r"\S+", candidate)) >= PROMPT_INPUT_MIN_WORDS:
return _truncate_by_words(candidate, PROMPT_INPUT_MAX_WORDS)
candidate = join_parts()
if not candidate:
return ""
if _detect_prompt_input_lang(candidate) == "zh":
return _truncate_by_chars(candidate, PROMPT_INPUT_MAX_ZH_CHARS)
return _truncate_by_words(candidate, PROMPT_INPUT_MAX_WORDS)
|
36516857
tangwang
feat(product_enri...
|
673
|
def _make_analysis_cache_key(
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
674
|
product: Dict[str, Any],
|
6f7840cf
tangwang
refactor: rename ...
|
675
|
target_lang: str,
|
36516857
tangwang
feat(product_enri...
|
676
|
analysis_kind: str,
|
2703b6ea
tangwang
refactor(indexer)...
|
677
|
category_taxonomy_profile: Optional[str] = None,
|
6f7840cf
tangwang
refactor: rename ...
|
678
|
) -> str:
|
36516857
tangwang
feat(product_enri...
|
679
|
"""构造缓存 key,仅由分析类型、prompt 实际输入文本内容与目标语言决定。"""
|
2703b6ea
tangwang
refactor(indexer)...
|
680
681
682
683
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
684
685
|
prompt_input = _build_prompt_input_text(product)
h = hashlib.md5(prompt_input.encode("utf-8")).hexdigest()
|
5aaf0c7d
tangwang
feat(indexer): 完善...
|
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
|
prompt_contract = {
"schema_name": schema.name,
"cache_version": schema.cache_version,
"system_message": SYSTEM_MESSAGE,
"user_instruction_template": USER_INSTRUCTION_TEMPLATE,
"shared_instruction": schema.shared_instruction,
"assistant_headers": schema.get_headers(target_lang),
"result_fields": schema.result_fields,
"meaningful_fields": schema.meaningful_fields,
"field_aliases": schema.field_aliases,
}
prompt_contract_hash = hashlib.md5(
json.dumps(prompt_contract, ensure_ascii=False, sort_keys=True).encode("utf-8")
).hexdigest()[:12]
return (
f"{ANCHOR_CACHE_PREFIX}:{analysis_kind}:{prompt_contract_hash}:"
f"{target_lang}:{prompt_input[:4]}{h}"
)
|
6f7840cf
tangwang
refactor: rename ...
|
704
705
|
|
36516857
tangwang
feat(product_enri...
|
706
|
def _make_anchor_cache_key(
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
707
|
product: Dict[str, Any],
|
6f7840cf
tangwang
refactor: rename ...
|
708
|
target_lang: str,
|
36516857
tangwang
feat(product_enri...
|
709
710
711
712
713
714
715
716
|
) -> str:
return _make_analysis_cache_key(product, target_lang, analysis_kind="content")
def _get_cached_analysis_result(
product: Dict[str, Any],
target_lang: str,
analysis_kind: str,
|
2703b6ea
tangwang
refactor(indexer)...
|
717
|
category_taxonomy_profile: Optional[str] = None,
|
6f7840cf
tangwang
refactor: rename ...
|
718
719
720
|
) -> Optional[Dict[str, Any]]:
if not _anchor_redis:
return None
|
2703b6ea
tangwang
refactor(indexer)...
|
721
722
723
724
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
725
|
try:
|
2703b6ea
tangwang
refactor(indexer)...
|
726
727
728
729
730
731
|
key = _make_analysis_cache_key(
product,
target_lang,
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
732
733
734
|
raw = _anchor_redis.get(key)
if not raw:
return None
|
36516857
tangwang
feat(product_enri...
|
735
736
737
738
739
740
741
|
result = _normalize_analysis_result(
json.loads(raw),
product=product,
target_lang=target_lang,
schema=schema,
)
if not _has_meaningful_analysis_content(result, schema):
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
742
743
|
return None
return result
|
6f7840cf
tangwang
refactor: rename ...
|
744
|
except Exception as e:
|
36516857
tangwang
feat(product_enri...
|
745
|
logger.warning("Failed to get %s analysis cache: %s", analysis_kind, e)
|
6f7840cf
tangwang
refactor: rename ...
|
746
747
748
|
return None
|
36516857
tangwang
feat(product_enri...
|
749
750
751
752
753
754
755
756
|
def _get_cached_anchor_result(
product: Dict[str, Any],
target_lang: str,
) -> Optional[Dict[str, Any]]:
return _get_cached_analysis_result(product, target_lang, analysis_kind="content")
def _set_cached_analysis_result(
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
757
|
product: Dict[str, Any],
|
6f7840cf
tangwang
refactor: rename ...
|
758
759
|
target_lang: str,
result: Dict[str, Any],
|
36516857
tangwang
feat(product_enri...
|
760
|
analysis_kind: str,
|
2703b6ea
tangwang
refactor(indexer)...
|
761
|
category_taxonomy_profile: Optional[str] = None,
|
6f7840cf
tangwang
refactor: rename ...
|
762
763
764
|
) -> None:
if not _anchor_redis:
return
|
2703b6ea
tangwang
refactor(indexer)...
|
765
766
767
768
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
769
|
try:
|
36516857
tangwang
feat(product_enri...
|
770
771
772
773
774
775
776
|
normalized = _normalize_analysis_result(
result,
product=product,
target_lang=target_lang,
schema=schema,
)
if not _has_meaningful_analysis_content(normalized, schema):
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
777
|
return
|
2703b6ea
tangwang
refactor(indexer)...
|
778
779
780
781
782
783
|
key = _make_analysis_cache_key(
product,
target_lang,
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
784
|
ttl = ANCHOR_CACHE_EXPIRE_DAYS * 24 * 3600
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
785
|
_anchor_redis.setex(key, ttl, json.dumps(normalized, ensure_ascii=False))
|
6f7840cf
tangwang
refactor: rename ...
|
786
|
except Exception as e:
|
36516857
tangwang
feat(product_enri...
|
787
788
789
790
791
792
793
794
795
|
logger.warning("Failed to set %s analysis cache: %s", analysis_kind, e)
def _set_cached_anchor_result(
product: Dict[str, Any],
target_lang: str,
result: Dict[str, Any],
) -> None:
_set_cached_analysis_result(product, target_lang, result, analysis_kind="content")
|
6f7840cf
tangwang
refactor: rename ...
|
796
797
|
|
a73a751f
tangwang
enrich
|
798
799
800
801
|
def _build_assistant_prefix(headers: List[str]) -> str:
header_line = "| " + " | ".join(headers) + " |"
separator_line = "|" + "----|" * len(headers)
return f"{header_line}\n{separator_line}\n"
|
6f7840cf
tangwang
refactor: rename ...
|
802
|
|
6f7840cf
tangwang
refactor: rename ...
|
803
|
|
36516857
tangwang
feat(product_enri...
|
804
805
|
def _build_shared_context(products: List[Dict[str, str]], schema: AnalysisSchema) -> str:
shared_context = schema.shared_instruction
|
6f7840cf
tangwang
refactor: rename ...
|
806
|
for idx, product in enumerate(products, 1):
|
a47416ec
tangwang
把融合逻辑改成乘法公式,并把 ES...
|
807
808
|
prompt_input = _build_prompt_input_text(product)
shared_context += f"{idx}. {prompt_input}\n"
|
a73a751f
tangwang
enrich
|
809
|
return shared_context
|
6f7840cf
tangwang
refactor: rename ...
|
810
|
|
6f7840cf
tangwang
refactor: rename ...
|
811
|
|
a73a751f
tangwang
enrich
|
812
813
814
815
816
|
def _hash_text(text: str) -> str:
return hashlib.md5((text or "").encode("utf-8")).hexdigest()[:12]
def _mark_shared_context_logged_once(shared_context_key: str) -> bool:
|
41f0b2e9
tangwang
product_enrich支持并发
|
817
818
819
820
|
with _logged_shared_context_lock:
if shared_context_key in _logged_shared_context_keys:
_logged_shared_context_keys.move_to_end(shared_context_key)
return False
|
a73a751f
tangwang
enrich
|
821
|
|
41f0b2e9
tangwang
product_enrich支持并发
|
822
823
824
825
|
_logged_shared_context_keys[shared_context_key] = None
if len(_logged_shared_context_keys) > LOGGED_SHARED_CONTEXT_CACHE_SIZE:
_logged_shared_context_keys.popitem(last=False)
return True
|
6f7840cf
tangwang
refactor: rename ...
|
826
|
|
6f7840cf
tangwang
refactor: rename ...
|
827
|
|
a73a751f
tangwang
enrich
|
828
829
|
def reset_logged_shared_context_keys() -> None:
"""测试辅助:清理已记录的共享 prompt key。"""
|
41f0b2e9
tangwang
product_enrich支持并发
|
830
831
|
with _logged_shared_context_lock:
_logged_shared_context_keys.clear()
|
6f7840cf
tangwang
refactor: rename ...
|
832
|
|
a73a751f
tangwang
enrich
|
833
834
835
836
|
def create_prompt(
products: List[Dict[str, str]],
target_lang: str = "zh",
|
36516857
tangwang
feat(product_enri...
|
837
|
analysis_kind: str = "content",
|
2703b6ea
tangwang
refactor(indexer)...
|
838
|
category_taxonomy_profile: Optional[str] = None,
|
36516857
tangwang
feat(product_enri...
|
839
|
) -> Tuple[Optional[str], Optional[str], Optional[str]]:
|
a73a751f
tangwang
enrich
|
840
|
"""根据目标语言创建共享上下文、本地化输出要求和 Partial Mode assistant 前缀。"""
|
2703b6ea
tangwang
refactor(indexer)...
|
841
842
843
844
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
36516857
tangwang
feat(product_enri...
|
845
|
markdown_table_headers = schema.get_headers(target_lang)
|
a73a751f
tangwang
enrich
|
846
847
|
if not markdown_table_headers:
logger.warning(
|
36516857
tangwang
feat(product_enri...
|
848
849
|
"Unsupported target_lang for markdown table headers: kind=%s lang=%s",
analysis_kind,
|
a73a751f
tangwang
enrich
|
850
851
852
|
target_lang,
)
return None, None, None
|
36516857
tangwang
feat(product_enri...
|
853
|
shared_context = _build_shared_context(products, schema)
|
a73a751f
tangwang
enrich
|
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
|
language_label = SOURCE_LANG_CODE_MAP.get(target_lang, target_lang)
user_prompt = USER_INSTRUCTION_TEMPLATE.format(language=language_label).strip()
assistant_prefix = _build_assistant_prefix(markdown_table_headers)
return shared_context, user_prompt, assistant_prefix
def _merge_partial_response(assistant_prefix: str, generated_content: str) -> str:
"""将 Partial Mode 的 assistant 前缀与补全文本拼成完整 markdown。"""
generated = (generated_content or "").lstrip()
prefix_lines = [line.strip() for line in assistant_prefix.strip().splitlines()]
generated_lines = generated.splitlines()
if generated_lines:
first_line = generated_lines[0].strip()
if prefix_lines and first_line == prefix_lines[0]:
generated_lines = generated_lines[1:]
if generated_lines and len(prefix_lines) > 1 and generated_lines[0].strip() == prefix_lines[1]:
generated_lines = generated_lines[1:]
elif len(prefix_lines) > 1 and first_line == prefix_lines[1]:
generated_lines = generated_lines[1:]
suffix = "\n".join(generated_lines).lstrip("\n")
if suffix:
return f"{assistant_prefix}{suffix}"
return assistant_prefix
def call_llm(
shared_context: str,
user_prompt: str,
assistant_prefix: str,
target_lang: str = "zh",
|
36516857
tangwang
feat(product_enri...
|
886
|
analysis_kind: str = "content",
|
a73a751f
tangwang
enrich
|
887
888
|
) -> Tuple[str, str]:
"""调用大模型 API(带重试机制),使用 Partial Mode 强制 markdown 表格前缀。"""
|
6f7840cf
tangwang
refactor: rename ...
|
889
890
891
892
|
headers = {
"Authorization": f"Bearer {API_KEY}",
"Content-Type": "application/json",
}
|
a73a751f
tangwang
enrich
|
893
894
895
|
shared_context_key = _hash_text(shared_context)
localized_tail_key = _hash_text(f"{target_lang}\n{user_prompt}\n{assistant_prefix}")
combined_user_prompt = f"{shared_context.rstrip()}\n\n{user_prompt.strip()}"
|
6f7840cf
tangwang
refactor: rename ...
|
896
897
898
899
900
901
|
payload = {
"model": MODEL_NAME,
"messages": [
{
"role": "system",
|
a73a751f
tangwang
enrich
|
902
|
"content": SYSTEM_MESSAGE,
|
6f7840cf
tangwang
refactor: rename ...
|
903
904
905
|
},
{
"role": "user",
|
a73a751f
tangwang
enrich
|
906
907
908
909
910
911
|
"content": combined_user_prompt,
},
{
"role": "assistant",
"content": assistant_prefix,
"partial": True,
|
6f7840cf
tangwang
refactor: rename ...
|
912
913
914
915
916
917
918
919
920
921
922
|
},
],
"temperature": 0.3,
"top_p": 0.8,
}
request_data = {
"headers": {k: v for k, v in headers.items() if k != "Authorization"},
"payload": payload,
}
|
a73a751f
tangwang
enrich
|
923
924
925
|
if _mark_shared_context_logged_once(shared_context_key):
logger.info(f"\n{'=' * 80}")
logger.info(
|
36516857
tangwang
feat(product_enri...
|
926
|
"LLM Shared Context [model=%s, kind=%s, shared_key=%s, chars=%s] (logged once per process key)",
|
a73a751f
tangwang
enrich
|
927
|
MODEL_NAME,
|
36516857
tangwang
feat(product_enri...
|
928
|
analysis_kind,
|
a73a751f
tangwang
enrich
|
929
930
931
932
933
|
shared_context_key,
len(shared_context),
)
logger.info("\nSystem Message:\n%s", SYSTEM_MESSAGE)
logger.info("\nShared Context:\n%s", shared_context)
|
6f7840cf
tangwang
refactor: rename ...
|
934
935
|
verbose_logger.info(f"\n{'=' * 80}")
|
a73a751f
tangwang
enrich
|
936
|
verbose_logger.info(
|
36516857
tangwang
feat(product_enri...
|
937
|
"LLM Request [model=%s, kind=%s, lang=%s, shared_key=%s, tail_key=%s]:",
|
a73a751f
tangwang
enrich
|
938
|
MODEL_NAME,
|
36516857
tangwang
feat(product_enri...
|
939
|
analysis_kind,
|
a73a751f
tangwang
enrich
|
940
941
942
943
|
target_lang,
shared_context_key,
localized_tail_key,
)
|
6f7840cf
tangwang
refactor: rename ...
|
944
|
verbose_logger.info(json.dumps(request_data, ensure_ascii=False, indent=2))
|
a73a751f
tangwang
enrich
|
945
946
947
948
949
950
|
verbose_logger.info(f"\nCombined User Prompt:\n{combined_user_prompt}")
verbose_logger.info(f"\nShared Context:\n{shared_context}")
verbose_logger.info(f"\nLocalized Requirement:\n{user_prompt}")
verbose_logger.info(f"\nAssistant Prefix:\n{assistant_prefix}")
logger.info(
|
36516857
tangwang
feat(product_enri...
|
951
952
|
"\nLLM Request Variant [kind=%s, lang=%s, shared_key=%s, tail_key=%s, prompt_chars=%s, prefix_chars=%s]",
analysis_kind,
|
a73a751f
tangwang
enrich
|
953
954
955
956
957
958
959
960
|
target_lang,
shared_context_key,
localized_tail_key,
len(user_prompt),
len(assistant_prefix),
)
logger.info("\nLocalized Requirement:\n%s", user_prompt)
logger.info("\nAssistant Prefix:\n%s", assistant_prefix)
|
6f7840cf
tangwang
refactor: rename ...
|
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
|
# 创建session,禁用代理
session = requests.Session()
session.trust_env = False # 忽略系统代理设置
try:
# 重试机制
for attempt in range(MAX_RETRIES):
try:
response = session.post(
f"{API_BASE_URL}/chat/completions",
headers=headers,
json=payload,
timeout=REQUEST_TIMEOUT,
proxies={"http": None, "https": None}, # 明确禁用代理
)
response.raise_for_status()
result = response.json()
|
a73a751f
tangwang
enrich
|
980
981
982
|
usage = result.get("usage") or {}
verbose_logger.info(
|
36516857
tangwang
feat(product_enri...
|
983
|
"\nLLM Response [model=%s, kind=%s, lang=%s, shared_key=%s, tail_key=%s]:",
|
a73a751f
tangwang
enrich
|
984
|
MODEL_NAME,
|
36516857
tangwang
feat(product_enri...
|
985
|
analysis_kind,
|
a73a751f
tangwang
enrich
|
986
987
988
989
990
|
target_lang,
shared_context_key,
localized_tail_key,
)
verbose_logger.info(json.dumps(result, ensure_ascii=False, indent=2))
|
6f7840cf
tangwang
refactor: rename ...
|
991
|
|
a73a751f
tangwang
enrich
|
992
993
|
generated_content = result["choices"][0]["message"]["content"]
full_markdown = _merge_partial_response(assistant_prefix, generated_content)
|
6f7840cf
tangwang
refactor: rename ...
|
994
|
|
a73a751f
tangwang
enrich
|
995
|
logger.info(
|
36516857
tangwang
feat(product_enri...
|
996
997
|
"\nLLM Response Summary [kind=%s, lang=%s, shared_key=%s, tail_key=%s, generated_chars=%s, completion_tokens=%s, prompt_tokens=%s, total_tokens=%s]",
analysis_kind,
|
a73a751f
tangwang
enrich
|
998
999
1000
1001
1002
1003
1004
1005
1006
1007
|
target_lang,
shared_context_key,
localized_tail_key,
len(generated_content or ""),
usage.get("completion_tokens"),
usage.get("prompt_tokens"),
usage.get("total_tokens"),
)
logger.info("\nGenerated Content:\n%s", generated_content)
logger.info("\nMerged Markdown:\n%s", full_markdown)
|
6f7840cf
tangwang
refactor: rename ...
|
1008
|
|
a73a751f
tangwang
enrich
|
1009
1010
|
verbose_logger.info(f"\nGenerated Content:\n{generated_content}")
verbose_logger.info(f"\nMerged Markdown:\n{full_markdown}")
|
6f7840cf
tangwang
refactor: rename ...
|
1011
|
|
a73a751f
tangwang
enrich
|
1012
|
return full_markdown, json.dumps(result, ensure_ascii=False)
|
6f7840cf
tangwang
refactor: rename ...
|
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
|
except requests.exceptions.ProxyError as e:
logger.warning(f"Attempt {attempt + 1}/{MAX_RETRIES}: Proxy error - {str(e)}")
if attempt < MAX_RETRIES - 1:
logger.info(f"Retrying in {RETRY_DELAY} seconds...")
time.sleep(RETRY_DELAY)
else:
raise
except requests.exceptions.RequestException as e:
logger.warning(f"Attempt {attempt + 1}/{MAX_RETRIES}: Request error - {str(e)}")
if attempt < MAX_RETRIES - 1:
logger.info(f"Retrying in {RETRY_DELAY} seconds...")
time.sleep(RETRY_DELAY)
else:
raise
except Exception as e:
logger.error(f"Unexpected error on attempt {attempt + 1}/{MAX_RETRIES}: {str(e)}")
if attempt < MAX_RETRIES - 1:
logger.info(f"Retrying in {RETRY_DELAY} seconds...")
time.sleep(RETRY_DELAY)
else:
raise
finally:
session.close()
|
36516857
tangwang
feat(product_enri...
|
1042
1043
1044
|
def parse_markdown_table(
markdown_content: str,
analysis_kind: str = "content",
|
2703b6ea
tangwang
refactor(indexer)...
|
1045
|
category_taxonomy_profile: Optional[str] = None,
|
36516857
tangwang
feat(product_enri...
|
1046
|
) -> List[Dict[str, str]]:
|
6f7840cf
tangwang
refactor: rename ...
|
1047
|
"""解析markdown表格内容"""
|
2703b6ea
tangwang
refactor(indexer)...
|
1048
1049
1050
1051
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
|
lines = markdown_content.strip().split("\n")
data = []
data_started = False
for line in lines:
line = line.strip()
if not line:
continue
# 表格行处理
if line.startswith("|"):
# 分隔行(---- 或 :---: 等;允许空格,如 "| ---- | ---- |")
sep_chars = line.replace("|", "").strip().replace(" ", "")
if sep_chars and set(sep_chars) <= {"-", ":"}:
data_started = True
continue
# 首个表头行:无论语言如何,统一跳过
if not data_started:
# 等待下一行数据行
continue
# 解析数据行
parts = [p.strip() for p in line.split("|")]
|
36516857
tangwang
feat(product_enri...
|
1076
1077
1078
1079
|
if parts and parts[0] == "":
parts = parts[1:]
if parts and parts[-1] == "":
parts = parts[:-1]
|
6f7840cf
tangwang
refactor: rename ...
|
1080
1081
|
if len(parts) >= 2:
|
36516857
tangwang
feat(product_enri...
|
1082
1083
|
row = {"seq_no": parts[0]}
for field_index, field_name in enumerate(schema.result_fields, start=1):
|
048631be
tangwang
1. 新增说明文档《product...
|
1084
1085
|
cell = parts[field_index] if len(parts) > field_index else ""
row[field_name] = _normalize_markdown_table_cell(cell)
|
6f7840cf
tangwang
refactor: rename ...
|
1086
1087
1088
1089
1090
|
data.append(row)
return data
|
a73a751f
tangwang
enrich
|
1091
1092
1093
1094
1095
|
def _log_parsed_result_quality(
batch_data: List[Dict[str, str]],
parsed_results: List[Dict[str, str]],
target_lang: str,
batch_num: int,
|
36516857
tangwang
feat(product_enri...
|
1096
|
analysis_kind: str,
|
2703b6ea
tangwang
refactor(indexer)...
|
1097
|
category_taxonomy_profile: Optional[str] = None,
|
a73a751f
tangwang
enrich
|
1098
|
) -> None:
|
2703b6ea
tangwang
refactor(indexer)...
|
1099
1100
1101
1102
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
a73a751f
tangwang
enrich
|
1103
1104
1105
1106
|
expected = len(batch_data)
actual = len(parsed_results)
if actual != expected:
logger.warning(
|
36516857
tangwang
feat(product_enri...
|
1107
1108
|
"Parsed row count mismatch for kind=%s batch=%s lang=%s: expected=%s actual=%s",
analysis_kind,
|
a73a751f
tangwang
enrich
|
1109
1110
1111
1112
1113
1114
|
batch_num,
target_lang,
expected,
actual,
)
|
36516857
tangwang
feat(product_enri...
|
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
|
if not schema.quality_fields:
logger.info(
"Parsed Quality Summary [kind=%s, batch=%s, lang=%s]: rows=%s/%s",
analysis_kind,
batch_num,
target_lang,
actual,
expected,
)
return
|
a73a751f
tangwang
enrich
|
1125
|
|
36516857
tangwang
feat(product_enri...
|
1126
1127
1128
1129
1130
|
missing_summary = ", ".join(
f"missing_{field}="
f"{sum(1 for item in parsed_results if not str(item.get(field) or '').strip())}"
for field in schema.quality_fields
)
|
a73a751f
tangwang
enrich
|
1131
|
logger.info(
|
36516857
tangwang
feat(product_enri...
|
1132
1133
|
"Parsed Quality Summary [kind=%s, batch=%s, lang=%s]: rows=%s/%s, %s",
analysis_kind,
|
a73a751f
tangwang
enrich
|
1134
1135
1136
1137
|
batch_num,
target_lang,
actual,
expected,
|
36516857
tangwang
feat(product_enri...
|
1138
|
missing_summary,
|
a73a751f
tangwang
enrich
|
1139
1140
1141
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
1142
1143
1144
1145
|
def process_batch(
batch_data: List[Dict[str, str]],
batch_num: int,
target_lang: str = "zh",
|
36516857
tangwang
feat(product_enri...
|
1146
|
analysis_kind: str = "content",
|
2703b6ea
tangwang
refactor(indexer)...
|
1147
|
category_taxonomy_profile: Optional[str] = None,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1148
|
) -> List[Dict[str, Any]]:
|
6f7840cf
tangwang
refactor: rename ...
|
1149
|
"""处理一个批次的数据"""
|
2703b6ea
tangwang
refactor(indexer)...
|
1150
1151
1152
1153
|
schema = _get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
6f7840cf
tangwang
refactor: rename ...
|
1154
|
logger.info(f"\n{'#' * 80}")
|
36516857
tangwang
feat(product_enri...
|
1155
1156
1157
1158
1159
1160
|
logger.info(
"Processing Batch %s (%s items, kind=%s)",
batch_num,
len(batch_data),
analysis_kind,
)
|
6f7840cf
tangwang
refactor: rename ...
|
1161
1162
|
# 创建提示词
|
a73a751f
tangwang
enrich
|
1163
1164
1165
|
shared_context, user_prompt, assistant_prefix = create_prompt(
batch_data,
target_lang=target_lang,
|
36516857
tangwang
feat(product_enri...
|
1166
|
analysis_kind=analysis_kind,
|
2703b6ea
tangwang
refactor(indexer)...
|
1167
|
category_taxonomy_profile=category_taxonomy_profile,
|
a73a751f
tangwang
enrich
|
1168
1169
1170
1171
1172
|
)
# 如果提示词创建失败(例如不支持的 target_lang),本次批次整体失败,不再继续调用 LLM
if shared_context is None or user_prompt is None or assistant_prefix is None:
logger.error(
|
36516857
tangwang
feat(product_enri...
|
1173
|
"Failed to create prompt for batch %s, kind=%s, target_lang=%s; "
|
a73a751f
tangwang
enrich
|
1174
1175
|
"marking entire batch as failed without calling LLM",
batch_num,
|
36516857
tangwang
feat(product_enri...
|
1176
|
analysis_kind,
|
a73a751f
tangwang
enrich
|
1177
1178
1179
|
target_lang,
)
return [
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1180
1181
1182
|
_make_empty_analysis_result(
item,
target_lang,
|
36516857
tangwang
feat(product_enri...
|
1183
|
schema,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1184
1185
|
error=f"prompt_creation_failed: unsupported target_lang={target_lang}",
)
|
a73a751f
tangwang
enrich
|
1186
1187
|
for item in batch_data
]
|
6f7840cf
tangwang
refactor: rename ...
|
1188
1189
1190
|
# 调用LLM
try:
|
a73a751f
tangwang
enrich
|
1191
1192
1193
1194
1195
|
raw_response, full_response_json = call_llm(
shared_context,
user_prompt,
assistant_prefix,
target_lang=target_lang,
|
36516857
tangwang
feat(product_enri...
|
1196
|
analysis_kind=analysis_kind,
|
a73a751f
tangwang
enrich
|
1197
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
1198
1199
|
# 解析结果
|
2703b6ea
tangwang
refactor(indexer)...
|
1200
1201
1202
1203
1204
|
parsed_results = parse_markdown_table(
raw_response,
analysis_kind=analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
36516857
tangwang
feat(product_enri...
|
1205
1206
1207
1208
1209
1210
|
_log_parsed_result_quality(
batch_data,
parsed_results,
target_lang,
batch_num,
analysis_kind,
|
2703b6ea
tangwang
refactor(indexer)...
|
1211
|
category_taxonomy_profile,
|
36516857
tangwang
feat(product_enri...
|
1212
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
1213
1214
1215
1216
1217
1218
1219
1220
|
logger.info(f"\nParsed Results ({len(parsed_results)} items):")
logger.info(json.dumps(parsed_results, ensure_ascii=False, indent=2))
# 映射回原始ID
results_with_ids = []
for i, parsed_item in enumerate(parsed_results):
if i < len(batch_data):
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1221
1222
1223
1224
1225
|
source_product = batch_data[i]
result = _normalize_analysis_result(
parsed_item,
product=source_product,
target_lang=target_lang,
|
36516857
tangwang
feat(product_enri...
|
1226
|
schema=schema,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1227
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
1228
|
results_with_ids.append(result)
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1229
|
logger.info(
|
36516857
tangwang
feat(product_enri...
|
1230
1231
|
"Mapped: kind=%s seq=%s -> original_id=%s",
analysis_kind,
|
90de78aa
tangwang
enrich接口 因为接口迭代、跟...
|
1232
1233
1234
|
parsed_item.get("seq_no"),
source_product.get("id"),
)
|
6f7840cf
tangwang
refactor: rename ...
|
1235
1236
1237
1238
|
# 保存批次 JSON 日志到独立文件
batch_log = {
"batch_num": batch_num,
|
36516857
tangwang
feat(product_enri...
|
1239
|
"analysis_kind": analysis_kind,
|
6f7840cf
tangwang
refactor: rename ...
|
1240
1241
1242
1243
1244
1245
1246
1247
|
"timestamp": datetime.now().isoformat(),
"input_products": batch_data,
"raw_response": raw_response,
"full_response_json": full_response_json,
"parsed_results": parsed_results,
"final_results": results_with_ids,
}
|
41f0b2e9
tangwang
product_enrich支持并发
|
1248
1249
|
# 并发写 batch json 日志时,保证文件名唯一避免覆盖
batch_call_id = uuid.uuid4().hex[:12]
|
36516857
tangwang
feat(product_enri...
|
1250
1251
1252
1253
|
batch_log_file = (
LOG_DIR
/ f"batch_{analysis_kind}_{batch_num:04d}_{timestamp}_{batch_call_id}.json"
)
|
6f7840cf
tangwang
refactor: rename ...
|
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
|
with open(batch_log_file, "w", encoding="utf-8") as f:
json.dump(batch_log, f, ensure_ascii=False, indent=2)
logger.info(f"Batch log saved to: {batch_log_file}")
return results_with_ids
except Exception as e:
logger.error(f"Error processing batch {batch_num}: {str(e)}", exc_info=True)
# 返回空结果,保持ID映射
return [
|
36516857
tangwang
feat(product_enri...
|
1265
|
_make_empty_analysis_result(item, target_lang, schema, error=str(e))
|
6f7840cf
tangwang
refactor: rename ...
|
1266
1267
1268
1269
1270
1271
1272
1273
1274
|
for item in batch_data
]
def analyze_products(
products: List[Dict[str, str]],
target_lang: str = "zh",
batch_size: Optional[int] = None,
tenant_id: Optional[str] = None,
|
36516857
tangwang
feat(product_enri...
|
1275
|
analysis_kind: str = "content",
|
2703b6ea
tangwang
refactor(indexer)...
|
1276
|
category_taxonomy_profile: Optional[str] = None,
|
6f7840cf
tangwang
refactor: rename ...
|
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
|
) -> List[Dict[str, Any]]:
"""
库调用入口:根据输入+语言,返回锚文本及各维度信息。
Args:
products: [{"id": "...", "title": "..."}]
target_lang: 输出语言
batch_size: 批大小,默认使用全局 BATCH_SIZE
"""
if not API_KEY:
raise RuntimeError("DASHSCOPE_API_KEY is not set, cannot call LLM")
if not products:
return []
|
2703b6ea
tangwang
refactor(indexer)...
|
1292
1293
1294
1295
|
_get_analysis_schema(
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
76e1f088
tangwang
1. 减少一列sell point...
|
1296
1297
1298
1299
1300
1301
1302
1303
1304
|
results_by_index: List[Optional[Dict[str, Any]]] = [None] * len(products)
uncached_items: List[Tuple[int, Dict[str, str]]] = []
for idx, product in enumerate(products):
title = str(product.get("title") or "").strip()
if not title:
uncached_items.append((idx, product))
continue
|
2703b6ea
tangwang
refactor(indexer)...
|
1305
1306
1307
1308
1309
1310
|
cached = _get_cached_analysis_result(
product,
target_lang,
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
76e1f088
tangwang
1. 减少一列sell point...
|
1311
1312
1313
|
if cached:
logger.info(
f"[analyze_products] Cache hit for title='{title[:50]}...', "
|
36516857
tangwang
feat(product_enri...
|
1314
|
f"kind={analysis_kind}, lang={target_lang}"
|
76e1f088
tangwang
1. 减少一列sell point...
|
1315
1316
1317
1318
1319
1320
1321
1322
|
)
results_by_index[idx] = cached
continue
uncached_items.append((idx, product))
if not uncached_items:
return [item for item in results_by_index if item is not None]
|
6f7840cf
tangwang
refactor: rename ...
|
1323
1324
1325
1326
1327
1328
|
# call_llm 一次处理上限固定为 BATCH_SIZE(默认 20):
# - 尽可能攒批处理;
# - 即便调用方传入更大的 batch_size,也会自动按上限拆批。
req_bs = BATCH_SIZE if batch_size is None else int(batch_size)
bs = max(1, min(req_bs, BATCH_SIZE))
|
76e1f088
tangwang
1. 减少一列sell point...
|
1329
|
total_batches = (len(uncached_items) + bs - 1) // bs
|
6f7840cf
tangwang
refactor: rename ...
|
1330
|
|
41f0b2e9
tangwang
product_enrich支持并发
|
1331
|
batch_jobs: List[Tuple[int, List[Tuple[int, Dict[str, str]]], List[Dict[str, str]]]] = []
|
76e1f088
tangwang
1. 减少一列sell point...
|
1332
|
for i in range(0, len(uncached_items), bs):
|
6f7840cf
tangwang
refactor: rename ...
|
1333
|
batch_num = i // bs + 1
|
76e1f088
tangwang
1. 减少一列sell point...
|
1334
1335
|
batch_slice = uncached_items[i : i + bs]
batch = [item for _, item in batch_slice]
|
41f0b2e9
tangwang
product_enrich支持并发
|
1336
1337
1338
1339
1340
1341
1342
|
batch_jobs.append((batch_num, batch_slice, batch))
# 只有一个批次时走串行,减少线程池创建开销与日志/日志文件的不可控交织
if total_batches <= 1 or CONTENT_UNDERSTANDING_MAX_WORKERS <= 1:
for batch_num, batch_slice, batch in batch_jobs:
logger.info(
f"[analyze_products] Processing batch {batch_num}/{total_batches}, "
|
36516857
tangwang
feat(product_enri...
|
1343
1344
1345
1346
1347
1348
1349
|
f"size={len(batch)}, kind={analysis_kind}, target_lang={target_lang}"
)
batch_results = process_batch(
batch,
batch_num=batch_num,
target_lang=target_lang,
analysis_kind=analysis_kind,
|
2703b6ea
tangwang
refactor(indexer)...
|
1350
|
category_taxonomy_profile=category_taxonomy_profile,
|
41f0b2e9
tangwang
product_enrich支持并发
|
1351
|
)
|
41f0b2e9
tangwang
product_enrich支持并发
|
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
|
for (original_idx, product), item in zip(batch_slice, batch_results):
results_by_index[original_idx] = item
title_input = str(item.get("title_input") or "").strip()
if not title_input:
continue
if item.get("error"):
# 不缓存错误结果,避免放大临时故障
continue
try:
|
2703b6ea
tangwang
refactor(indexer)...
|
1362
1363
1364
1365
1366
1367
1368
|
_set_cached_analysis_result(
product,
target_lang,
item,
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
41f0b2e9
tangwang
product_enrich支持并发
|
1369
1370
1371
1372
1373
|
except Exception:
# 已在内部记录 warning
pass
else:
max_workers = min(CONTENT_UNDERSTANDING_MAX_WORKERS, len(batch_jobs))
|
6f7840cf
tangwang
refactor: rename ...
|
1374
|
logger.info(
|
41f0b2e9
tangwang
product_enrich支持并发
|
1375
|
"[analyze_products] Using ThreadPoolExecutor for uncached batches: "
|
36516857
tangwang
feat(product_enri...
|
1376
|
"max_workers=%s, total_batches=%s, bs=%s, kind=%s, target_lang=%s",
|
41f0b2e9
tangwang
product_enrich支持并发
|
1377
1378
1379
|
max_workers,
total_batches,
bs,
|
36516857
tangwang
feat(product_enri...
|
1380
|
analysis_kind,
|
41f0b2e9
tangwang
product_enrich支持并发
|
1381
|
target_lang,
|
6f7840cf
tangwang
refactor: rename ...
|
1382
|
)
|
6f7840cf
tangwang
refactor: rename ...
|
1383
|
|
41f0b2e9
tangwang
product_enrich支持并发
|
1384
1385
1386
1387
1388
1389
|
# 只把“LLM 调用 + markdown 解析”放到线程里;Redis get/set 保持在主线程,避免并发写入带来额外风险。
# 注意:线程池是模块级单例,因此这里的 max_workers 主要用于日志语义(实际并发受单例池上限约束)。
executor = _get_content_understanding_executor()
future_by_batch_num: Dict[int, Any] = {}
for batch_num, _batch_slice, batch in batch_jobs:
future_by_batch_num[batch_num] = executor.submit(
|
36516857
tangwang
feat(product_enri...
|
1390
1391
1392
1393
1394
|
process_batch,
batch,
batch_num=batch_num,
target_lang=target_lang,
analysis_kind=analysis_kind,
|
2703b6ea
tangwang
refactor(indexer)...
|
1395
|
category_taxonomy_profile=category_taxonomy_profile,
|
41f0b2e9
tangwang
product_enrich支持并发
|
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
|
)
# 按 batch_num 回填,确保输出稳定(results_by_index 是按原始 input index 映射的)
for batch_num, batch_slice, _batch in batch_jobs:
batch_results = future_by_batch_num[batch_num].result()
for (original_idx, product), item in zip(batch_slice, batch_results):
results_by_index[original_idx] = item
title_input = str(item.get("title_input") or "").strip()
if not title_input:
continue
if item.get("error"):
# 不缓存错误结果,避免放大临时故障
continue
try:
|
2703b6ea
tangwang
refactor(indexer)...
|
1410
1411
1412
1413
1414
1415
1416
|
_set_cached_analysis_result(
product,
target_lang,
item,
analysis_kind,
category_taxonomy_profile=category_taxonomy_profile,
)
|
41f0b2e9
tangwang
product_enrich支持并发
|
1417
1418
1419
|
except Exception:
# 已在内部记录 warning
pass
|
6f7840cf
tangwang
refactor: rename ...
|
1420
|
|
76e1f088
tangwang
1. 减少一列sell point...
|
1421
|
return [item for item in results_by_index if item is not None]
|