zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小更新，expert库的领域

Browse Source
This commit is contained in:
wangjinlei
2026-07-20 16:25:40 +08:00
parent f09af1d4e4
commit a396ff86da
5 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
application/common/ExpertFinderService.php
View File

@@ -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)