From a396ff86dad3247e166a140e6cb3859abcd720e9 Mon Sep 17 00:00:00 2001 From: wangjinlei <751475802@qq.com> Date: Mon, 20 Jul 2026 16:25:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=9B=B4=E6=96=B0=EF=BC=8Cexpert?= =?UTF-8?q?=E5=BA=93=E7=9A=84=E9=A2=86=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 5 +++ application/api/controller/ExpertFinder.php | 10 ++--- application/api/job/FillExpertCountry.php | 21 ++++----- application/common.php | 2 +- application/common/ExpertFinderService.php | 49 +++++++++++++++++++-- 5 files changed, 66 insertions(+), 21 deletions(-) diff --git a/.env b/.env index fdc27593..27d789fe 100644 --- a/.env +++ b/.env @@ -85,6 +85,11 @@ citation_chat_model = qwen2.5:7b citation_chat_api_key = citation_chat_timeout = 120 +[expert_country] +chat_url_local = http://125.39.141.154:10002/v1/chat/completions +chat_url_remote = http://chat.taimed.cn/v1/chat/completions +context_limit = 2000 + [scopus] api_key = 54f915fc96e86b94ae8722ce7fdd69c7 diff --git a/application/api/controller/ExpertFinder.php b/application/api/controller/ExpertFinder.php index ee8e5aac..905adf19 100644 --- a/application/api/controller/ExpertFinder.php +++ b/application/api/controller/ExpertFinder.php @@ -85,14 +85,13 @@ class ExpertFinder extends Base } /** - * 启动国家解析：同时启动两条链，分别用不同模型并行处理。 - * 只需调一次，两条链各自链式执行直到全部处理完。 + * 启动国家解析链：只需调一次，链式执行直到全部处理完。 + * 每条任务在 fillExpertCountry 内按 affiliation 上下文长度动态选择模型地址。 */ public function batchFillCountry(){ $service = new ExpertFinderService(); -// $chain1 = $service->enqueueNextCountryFill(0, 'FetchExpertCity', ''); - $chain2 = $service->enqueueNextCountryFill(0, 'FetchExpertCityOne', 'http://125.39.141.154:10002/v1/chat/completions'); + $started = $service->enqueueNextCountryFill(0, 'FetchExpertCityOne', ''); $pending = Db::name('expert') ->where('affiliation', '<>', '') @@ -101,8 +100,7 @@ class ExpertFinder extends Base ->count(); return jsonSuccess([ -// 'chain1_started' => $chain1, - 'chain2_started' => $chain2, + 'chain_started' => $started, 'pending' => $pending, ]); } diff --git a/application/api/job/FillExpertCountry.php b/application/api/job/FillExpertCountry.php index c58ff120..5491c410 100644 --- a/application/api/job/FillExpertCountry.php +++ b/application/api/job/FillExpertCountry.php @@ -6,12 +6,13 @@ use think\queue\Job; use app\common\ExpertFinderService; /** - * 队列任务：用本地大模型从 affiliation 推断国家，写入 expert.country_id / country。 + * 队列任务：用大模型从 affiliation 推断国家，写入 expert.country_id / country。 * 处理完当前专家后，自动找下一个推入同一队列（链式执行），直到全部处理完。 * - * 支持多队列并行：通过 $data['queue'] 和 $data['chat_url'] 区分不同的链/模型。 + * 模型地址：默认不传 chat_url，由 ExpertFinderService::fillExpertCountry + * 按 affiliation 长度在本地/远程模型间动态选择；显式传入 chat_url 时强制使用。 * - * 单条任务受本地 LLM 响应时间影响（一般 2-10s），常驻 worker 由 QueueJob + * 单条任务受 LLM 响应时间影响（一般 2-10s），常驻 worker 由 QueueJob * 在进程超 6h 或遇致命 DB 错误时主动 exit(1) 让 supervisor 拉起新进程。 */ class FillExpertCountry @@ -19,20 +20,20 @@ class FillExpertCountry public function fire(Job $job, $data) { - $expertId = intval(isset($data['expert_id']) ? $data['expert_id'] : 0); $affiliation = isset($data['affiliation']) ? trim((string)$data['affiliation']) : ''; $queue = isset($data['queue']) ? (string)$data['queue'] : 'FetchExperts'; + // 留空则每条任务按上下文长度自行选模型，不要把上一条的 URL 固定传下去 $chatUrl = isset($data['chat_url']) ? (string)$data['chat_url'] : ''; $service = new ExpertFinderService(); - if ($expertId && $affiliation !== '') { - $service->fillExpertCountry($expertId, $affiliation, $chatUrl); - } - $job->delete(); + if ($expertId && $affiliation !== '') { + $service->fillExpertCountry($expertId, $affiliation, $chatUrl); + } + $job->delete(); - // 链式：处理完当前专家立刻拉下一个进来 - $service->enqueueNextCountryFill(1, $queue, $chatUrl); + // 链式：下一条也不透传固定 URL，继续按条动态选模型 + $service->enqueueNextCountryFill(1, $queue, ''); } } diff --git a/application/common.php b/application/common.php index 31dd9c06..5d13133d 100644 --- a/application/common.php +++ b/application/common.php @@ -1293,7 +1293,7 @@ function getArticleType(){ ['name' => 'CASE SERIES','value' => 'CS'], ['name' => 'RETRACTION','value' => 'RT'], ['name' => 'MINI REVIEW','value' => 'MR'], - // ['name' => 'PERSPECTIVE','value' => 'PERSP'], + ['name' => 'PERSPECTIVE','value' => 'PERSP'], ['name' => 'OTHERS','value' => 'O'] ], 'supplement' => [ diff --git a/application/common/ExpertFinderService.php b/application/common/ExpertFinderService.php index e92cb5c5..2c56de6c 100644 --- a/application/common/ExpertFinderService.php +++ b/application/common/ExpertFinderService.php @@ -668,7 +668,7 @@ class ExpertFinderService * * @param int $delay 延迟秒数 * @param string $queue 队列名（不同队列跑不同 worker，互不阻塞） - * @param string $chatUrl 该链使用的模型地址（为空则用默认） + * @param string $chatUrl 强制指定模型地址；为空则由 fillExpertCountry 按上下文长度动态选择 * @return bool */ public function enqueueNextCountryFill($delay = 1, $queue = 'FetchExperts', $chatUrl = '') @@ -705,6 +705,11 @@ class ExpertFinderService /** * 对单个专家执行国家解析（同步），由队列 Job FillExpertCountry 调用，也可直接调用测试。 + * + * 模型地址按上下文长度动态选择： + * - affiliation 字符数 <= 阈值 → 本地模型（默认 125.39.141.154:10002） + * - 超过阈值 → 远程模型（默认 chat.taimed.cn） + * 若调用方显式传入 $chatUrl，则优先使用该地址（调试用）。 */ public function fillExpertCountry($expertId, $affiliation, $chatUrl = '') { @@ -714,8 +719,10 @@ class ExpertFinderService return; } - $defaultUrl = trim((string)Env::get('expert_country_chat_url', Env::get('citation_chat_url', 'http://chat.taimed.cn/v1/chat/completions'))); - $url = ($chatUrl !== '') ? $chatUrl : $defaultUrl; + $url = trim((string)$chatUrl); + if ($url === '') { + $url = $this->resolveCountryChatUrl($affiliation); + } $resolver = new CountryResolverService([ 'chat_url' => $url, @@ -752,15 +759,49 @@ class ExpertFinderService 'country_id' => $countryId, 'country' => $enName, ]); + $this->log('[CountryFill] expert_id=' . $expertId . ' ok country=' . $enName . ' url=' . $url); } else { // country_id = -1 表示「已尝试但未识别」，避免链式执行时反复卡在同一条 Db::name('expert')->where('expert_id', intval($expertId))->update([ 'country_id' => -1, ]); - $this->log('[CountryFill] expert_id=' . $expertId . ' unresolved, code=' . ($result['code'] ?? '') . ' en_name=' . ($result['en_name'] ?? '')); + $this->log('[CountryFill] expert_id=' . $expertId . ' unresolved, code=' . ($result['code'] ?? '') . ' en_name=' . ($result['en_name'] ?? '') . ' url=' . $url); } } + /** + * 按 affiliation 上下文长度选择国家解析模型地址。 + * + * 环境变量（[expert_country] 段，也兼容扁平 key）： + * chat_url_local / expert_country_chat_url_local + * chat_url_remote / expert_country_chat_url_remote + * context_limit / expert_country_context_limit （字符数，默认 2000） + */ + public function resolveCountryChatUrl($affiliation) + { + $localUrl = trim((string)Env::get( + 'expert_country.chat_url_local', + Env::get('expert_country_chat_url_local', 'http://125.39.141.154:10002/v1/chat/completions') + )); + $remoteUrl = trim((string)Env::get( + 'expert_country.chat_url_remote', + Env::get( + 'expert_country_chat_url_remote', + Env::get('expert_country_chat_url', 'http://chat.taimed.cn/v1/chat/completions') + ) + )); + $limit = max(1, intval(Env::get( + 'expert_country.context_limit', + Env::get('expert_country_context_limit', 2000) + ))); + + $len = mb_strlen(trim((string)$affiliation), 'UTF-8'); + if ($len > $limit) { + return $remoteUrl !== '' ? $remoteUrl : $localUrl; + } + return $localUrl !== '' ? $localUrl : $remoteUrl; + } + // ==================== Text Helpers ==================== private function extractEmailFromText($text)