diff --git a/app/Http/Controllers/Api/AssistantController.php b/app/Http/Controllers/Api/AssistantController.php index f9bc11498..9f744f177 100644 --- a/app/Http/Controllers/Api/AssistantController.php +++ b/app/Http/Controllers/Api/AssistantController.php @@ -92,12 +92,35 @@ class AssistantController extends AbstractController default => $modelType, }; - $authResult = Ihttp::ihttp_post('http://nginx/ai/invoke/auth', [ + $authParams = [ 'api_key' => $apiKey, 'model_type' => $remoteModelType, 'model_name' => $modelName, 'context' => $contextJson, - ], 30); + ]; + + if ($setting[$modelType . '_base_url']) { + $authParams['base_url'] = $setting[$modelType . '_base_url']; + } + if ($setting[$modelType . '_agency']) { + $authParams['agency'] = $setting[$modelType . '_agency']; + } + + $thinkPatterns = [ + "/^(.+?)(\s+|\s*[_-]\s*)(think|thinking|reasoning)\s*$/", + "/^(.+?)\s*\(\s*(think|thinking|reasoning)\s*\)\s*$/" + ]; + $thinkMatch = []; + foreach ($thinkPatterns as $pattern) { + if (preg_match($pattern, $authParams['model_name'], $thinkMatch)) { + break; + } + } + if ($thinkMatch && !empty($thinkMatch[1])) { + $authParams['model_name'] = $thinkMatch[1]; + } + + $authResult = Ihttp::ihttp_post('http://nginx/ai/invoke/auth', $authParams, 30); if (Base::isError($authResult)) { return Base::retError($authResult['msg']); diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php index de6623974..1f86bd8d8 100755 --- a/app/Http/Controllers/Api/SystemController.php +++ b/app/Http/Controllers/Api/SystemController.php @@ -328,7 +328,7 @@ class SystemController extends AbstractController } /** - * @api {get} api/system/setting/aibot 获取会议设置、保存AI机器人设置(限管理员) + * @api {get} api/system/setting/aibot 获取AI设置、保存AI机器人设置(限管理员) * * @apiVersion 1.0.0 * @apiGroup system