github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-17 06:32:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-02-22 12:14:03 +08:00
parent 6bd20038f9
commit f31e88bed1
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/SystemController.php
View File

@ -333,6 +333,8 @@ class SystemController extends AbstractController
* *
* @apiParam {String} type AI类型 * @apiParam {String} type AI类型
* @apiParam {String} [base_url] 基础URL（仅 type=ollama 时有效） * @apiParam {String} [base_url] 基础URL（仅 type=ollama 时有效）
* @apiParam {String} [key] Key（仅 type=ollama 时有效）
* @apiParam {String} [agency] 使用代理（仅 type=ollama 时有效）
* *
* @apiSuccess {Number} ret 返回状态码（1正确、0错误） * @apiSuccess {Number} ret 返回状态码（1正确、0错误）
* @apiSuccess {String} msg 返回信息（错误描述） * @apiSuccess {String} msg 返回信息（错误描述）
@ -341,12 +343,14 @@ class SystemController extends AbstractController
public function setting__aibot_defmodels() public function setting__aibot_defmodels()
{ {
$type = trim(Request::input('type')); $type = trim(Request::input('type'));
$baseUrl = trim(Request::input('base_url'));
if ($type == 'ollama') { if ($type == 'ollama') {
$baseUrl = trim(Request::input('base_url'));
$key = trim(Request::input('key'));
$agency = trim(Request::input('agency'));
if (empty($baseUrl)) { if (empty($baseUrl)) {
return Base::retError('请先填写 Base URL'); return Base::retError('请先填写 Base URL');
} }
return Extranet::ollamaModels($baseUrl); return Extranet::ollamaModels($baseUrl, $key, $agency);
} }
$models = Setting::AIDefaultModels($type); $models = Setting::AIDefaultModels($type);
if (empty($models)) { if (empty($models)) {

34
app/Module/Extranet.php
View File

@ -34,11 +34,7 @@ class Extranet
]; ];
if ($aibotSetting['openai_agency']) { if ($aibotSetting['openai_agency']) {
$extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency']; $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
if (str_contains($aibotSetting['openai_agency'], 'socks')) { $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
} else {
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
}
} }
$res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [ $res = Ihttp::ihttp_request('https://api.openai.com/v1/audio/transcriptions', [
'file' => new \CURLFile($filePath), 'file' => new \CURLFile($filePath),
@ -74,11 +70,7 @@ class Extranet
]; ];
if ($aibotSetting['openai_agency']) { if ($aibotSetting['openai_agency']) {
$extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency']; $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
if (str_contains($aibotSetting['openai_agency'], 'socks')) { $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
} else {
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
}
} }
$res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([ $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
"model" => "gpt-4o-mini", "model" => "gpt-4o-mini",
@ -125,11 +117,7 @@ class Extranet
]; ];
if ($aibotSetting['openai_agency']) { if ($aibotSetting['openai_agency']) {
$extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency']; $extra['CURLOPT_PROXY'] = $aibotSetting['openai_agency'];
if (str_contains($aibotSetting['openai_agency'], 'socks')) { $extra['CURLOPT_PROXYTYPE'] = str_contains($aibotSetting['openai_agency'], 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_SOCKS5;
} else {
$extra['CURLOPT_PROXYTYPE'] = CURLPROXY_HTTP;
}
} }
$res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([ $res = Ihttp::ihttp_request('https://api.openai.com/v1/chat/completions', json_encode([
"model" => "gpt-4o-mini", "model" => "gpt-4o-mini",
@ -162,11 +150,23 @@ class Extranet
/** /**
* 获取 ollama 模型 * 获取 ollama 模型
* @param $baseUrl * @param $baseUrl
* @param $key
* @param $agency
* @return array * @return array
*/ */
public static function ollamaModels($baseUrl) public static function ollamaModels($baseUrl, $key = null, $agency = null)
{ {
$res = Ihttp::ihttp_request($baseUrl . '/api/tags', [], [], 15); $extra = [
'Content-Type' => 'application/json',
];
if ($key) {
$extra['Authorization'] = 'Bearer ' . $key;
}
if ($agency) {
$extra['CURLOPT_PROXY'] = $agency;
$extra['CURLOPT_PROXYTYPE'] = str_contains($agency, 'socks') ? CURLPROXY_SOCKS5 : CURLPROXY_HTTP;
}
$res = Ihttp::ihttp_request($baseUrl . '/api/tags', [], $extra, 15);
if (Base::isError($res)) { if (Base::isError($res)) {
return Base::retError("获取失败", $res); return Base::retError("获取失败", $res);
} }

1
resources/assets/js/pages/manage/setting/components/SystemAibot.vue
View File

@ -202,6 +202,7 @@ export default {
} }
data.base_url = this.formData[`${this.type}_base_url`]; data.base_url = this.formData[`${this.type}_base_url`];
data.key = this.formData[`${this.type}_key`]; data.key = this.formData[`${this.type}_key`];
data.agency = this.formData[`${this.type}_agency`];
} }
this.$store.dispatch("call", { this.$store.dispatch("call", {
url: 'system/setting/aibot_defmodels?type=' + this.type, url: 'system/setting/aibot_defmodels?type=' + this.type,