nanxun/jizhi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: reorganize admin llm settings

Browse Source
This commit is contained in:
nanxun
2026-08-22 22:06:01 +08:00
parent 78c42eff53
commit f8f0b3c4fd
17 changed files with 1019 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/MiaoJiZhang.Api/Services/OpenAiVisionClient.cs
+65 -35
View File
@@ -13,22 +13,26 @@ namespace MiaoJiZhang.Api.Services;
public partial class OpenAiVisionClient : ILlmClient
{
private readonly IServiceScopeFactory _sf;
private readonly HttpClient _http;
private readonly ILogger<OpenAiVisionClient> _logger;
private string? _baseUrl, _apiKey, _model, _protocol;
private int _maxTokens = 1024;
private readonly HttpClient _http;
private readonly ILogger<OpenAiVisionClient> _logger;
private readonly LlmSecretProtector _secretProtector;
private string? _baseUrl, _apiKey, _model, _protocol;
private int _maxTokens = 1024;
private double _temperature = 0.7;
private DateTime _last = DateTime.MinValue;
private static readonly object _lk = new();
public OpenAiVisionClient(
IServiceScopeFactory sf,
IHttpClientFactory hf,
ILogger<OpenAiVisionClient> logger)
IServiceScopeFactory sf,
IHttpClientFactory hf,
LlmSecretProtector secretProtector,
ILogger<OpenAiVisionClient> logger)
{
_sf = sf;
_http = hf.CreateClient("LlmClient");
_http.Timeout = TimeSpan.FromSeconds(120);
_logger = logger;
_http = hf.CreateClient("LlmClient");
_http.Timeout = TimeSpan.FromSeconds(120);
_secretProtector = secretProtector;
_logger = logger;
}
public bool IsEnabled { get { Load(); return !string.IsNullOrEmpty(_apiKey); } }
@@ -679,14 +683,22 @@ public partial class OpenAiVisionClient : ILlmClient
public async Task<(bool, string?)> TestConnectionAsync(CancellationToken ct = default)
{
Load();
if (string.IsNullOrEmpty(_apiKey)) return (false, "API Key 为空");
if (_protocol != "responses")
return (false, "AI Agent 记账要求使用 Responses 协议");
try
{
var tool = new AgentToolDefinition(
Load();
if (string.IsNullOrEmpty(_apiKey)) return (false, "API Key 为空");
try
{
if (_protocol != "responses")
{
var reply = await L(
"你正在执行连接测试，只回复 OK。",
"测试连接",
ct);
return string.IsNullOrWhiteSpace(reply)
? (false, "模型没有返回内容")
: (true, null);
}
var tool = new AgentToolDefinition(
"diagnostic_echo",
"连接测试时必须调用的无副作用工具",
JsonSerializer.Deserialize<JsonElement>(
@@ -716,8 +728,13 @@ public partial class OpenAiVisionClient : ILlmClient
var msgs = new List<object>();
if (_protocol == "messages") msgs.Add(new { role = "user", content = s + "\n\n" + u });
else { msgs.Add(new { role = "system", content = s }); msgs.Add(new { role = "user", content = u }); }
await SA(BuildBody(msgs, _maxTokens, 0.7), onToken, ct);
}
await SA(BuildBody(msgs, _maxTokens, _temperature), onToken, ct);
}
public void InvalidateConfiguration()
{
lock (_lk) _last = DateTime.MinValue;
}
void Load()
{
@@ -728,23 +745,36 @@ public partial class OpenAiVisionClient : ILlmClient
try
{
using var scope = _sf.CreateScope();
var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
var config = db.AppConfigs.ToDictionary(x => x.Key, x => x.Value);
_apiKey = Environment.GetEnvironmentVariable("LLM_API_KEY") ?? "";
_baseUrl = (
Environment.GetEnvironmentVariable("LLM_BASE_URL") ??
config.GetValueOrDefault("llm.base_url", "https://api.openai.com/v1") ??
"").TrimEnd('/');
_model = Environment.GetEnvironmentVariable("LLM_MODEL") ??
config.GetValueOrDefault("llm.model", "gpt-4o-mini");
_protocol = Environment.GetEnvironmentVariable("LLM_PROTOCOL") ??
config.GetValueOrDefault("llm.protocol", "chat_completions");
var db = scope.ServiceProvider.GetRequiredService<AppDbContext>();
var config = db.AppConfigs.ToDictionary(x => x.Key, x => x.Value);
_apiKey = _secretProtector.TryUnprotect(
config.GetValueOrDefault(LlmSecretProtector.ConfigKey),
out var protectedApiKey)
? protectedApiKey
: Environment.GetEnvironmentVariable("LLM_API_KEY") ?? "";
_baseUrl = (
config.GetValueOrDefault("llm.base_url") ??
Environment.GetEnvironmentVariable("LLM_BASE_URL") ??
"https://api.openai.com/v1").TrimEnd('/');
_model = config.GetValueOrDefault("llm.model") ??
Environment.GetEnvironmentVariable("LLM_MODEL") ??
"gpt-4o-mini";
_protocol = config.GetValueOrDefault("llm.protocol") ??
Environment.GetEnvironmentVariable("LLM_PROTOCOL") ??
"responses";
_maxTokens = int.TryParse(
config.GetValueOrDefault("llm.max_tokens"),
out var maxTokens)
? Math.Clamp(maxTokens, 64, 4096)
: 1024;
_last = DateTime.UtcNow;
? Math.Clamp(maxTokens, 64, 4096)
: 1024;
_temperature = double.TryParse(
config.GetValueOrDefault("llm.temperature"),
NumberStyles.Float,
CultureInfo.InvariantCulture,
out var temperature)
? Math.Clamp(temperature, 0, 2)
: 0.7;
_last = DateTime.UtcNow;
}
catch (Exception exception)
{
@@ -754,7 +784,7 @@ public partial class OpenAiVisionClient : ILlmClient
}
async Task<string?> L(string sys, string user, CancellationToken ct)
{ Load(); var msgs = new List<object>(); if (_protocol == "messages") msgs.Add(new { role = "user", content = sys + "\n\n" + user }); else { msgs.Add(new { role = "system", content = sys }); msgs.Add(new { role = "user", content = user }); } var (j, _) = await CA(BuildBody(msgs, _maxTokens, 0.7), ct); if (j is null) return null; var content = EX(j).Trim(); return content.Length > 0 ? content : null; }
{ Load(); var msgs = new List<object>(); if (_protocol == "messages") msgs.Add(new { role = "user", content = sys + "\n\n" + user }); else { msgs.Add(new { role = "system", content = sys }); msgs.Add(new { role = "user", content = user }); } var (j, _) = await CA(BuildBody(msgs, _maxTokens, _temperature), ct); if (j is null) return null; var content = EX(j).Trim(); return content.Length > 0 ? content : null; }
object BuildBody(List<object> msgs, int maxT, double temp) => _protocol switch
{ "messages" => new { model = _model, messages = msgs, max_tokens = maxT, temperature = temp }, "responses" => new { model = _model, input = msgs, max_output_tokens = maxT, temperature = temp, thinking = new { type = "disabled" } }, _ => new { model = _model, messages = msgs, max_tokens = maxT, temperature = temp } };