mirror of
https://github.com/MindWorkAI/AI-Studio.git
synced 2026-10-04 23:49:40 +00:00
Merge branch 'main' into chunk-data
Resolved 29 conflicting files. The notable decisions: Confidence: main's tool-calling gate (RequiredProviderConfidence) and this branch's local-RAG gate (DataConfidenceLevel) turned out to be the same rule on the same axis, so they are now one field. Both tool results and data sources raise it through RequireProviderConfidence(). The gate checks the level strictly and no longer exempts providers trusted by configuration: TrustedProviderIds is documented as applying to data-source security checks only, and organizations set confidence through DataConfidence .CustomConfidenceScheme instead. The security axis (DataSecurity, ERI, IsTrustedForDataSourceSecurityChecks) is unchanged. Provider creation: main's CreateProvider signature won (hfEndpointKind, capabilityOverrides, no model parameter); tokenizerPath was added to it and is set for every provider, including the new Hetzner, IONOS and LiteLLM. Provider and EmbeddingProvider combine the record parameters, Lua parsing and Lua serialization of both sides. File types: main's hierarchy (ODT leaf, WORD parent, PowerPoint without the legacy .ppt, TABULAR instead of DELIMITED_TABLE) plus this branch's SPREADSHEET parent with ODS and the xlsm/xlsb/xla/xlam extensions, which the runtime already reads. Both sides had added a conflicting HTML filter; the reading family keeps the name, and the export path uses a narrow HTML_DOCUMENT, following the existing LATEX/TEX split. Runtime: main's file_data.rs is the base, including the prompt-injection sanitizer and the extraction routes. Token counting and chunk segmentation moved into take_released, so they act on the text the filter has released rather than on text it is still holding. A failed count is logged and left out instead of ending the extraction, because the app counts such a segment itself. Data sources: the participating-provider checks of this branch are kept, and main's GetAllowedDataSources overload now builds on them. DirectChatService resolves the launched chat's data source options before the check, so filter and chat see the same options. .NET and Rust both build clean; I18N regenerated to 4060 keys.
This commit is contained in:
640 files changed
+45059
-4952
No files matched your search
@@ -2,6 +2,7 @@ using AIStudio.Agents;
|
||||
using AIStudio.Agents.AssistantAudit;
|
||||
using AIStudio.Assistants.VisualBriefing;
|
||||
using AIStudio.Settings;
|
||||
using AIStudio.Tools.ToolCallingSystem;
|
||||
using AIStudio.Tools.Databases;
|
||||
using AIStudio.Tools.AIJobs;
|
||||
using AIStudio.Tools.AssistantSessions;
|
||||
@@ -9,8 +10,17 @@ using AIStudio.Tools.Media;
|
||||
using AIStudio.Tools.PluginSystem;
|
||||
using AIStudio.Tools.PluginSystem.Assistants;
|
||||
using AIStudio.Tools.Rust;
|
||||
using AIStudio.Tools.Security;
|
||||
using AIStudio.Tools.Services;
|
||||
using AIStudio.Tools.ToolCallingSystem.Harness;
|
||||
using AIStudio.Tools.ToolCallingSystem.ToolCallingImplementations;
|
||||
using AIStudio.Tools.ToolCallingSystem.ToolCallingImplementations.WebSearch;
|
||||
using AIStudio.Tools.ToolCallingSystem.ToolCallingImplementations.WebSearch.SearXNG;
|
||||
using AIStudio.Tools.ToolCallingSystem.ToolCallingImplementations.WebSearch.Staan;
|
||||
using AIStudio.Tools.ToolCallingSystem.ToolCallingImplementations.WebSearch.Tavily;
|
||||
using AIStudio.Tools.Web;
|
||||
|
||||
using Microsoft.AspNetCore.Components.Server.Circuits;
|
||||
using Microsoft.AspNetCore.DataProtection;
|
||||
using Microsoft.AspNetCore.Server.Kestrel.Core;
|
||||
using Microsoft.Extensions.Logging.Console;
|
||||
@@ -114,7 +124,7 @@ internal sealed class Program
|
||||
options.FormatterName = TerminalLogger.FORMATTER_NAME;
|
||||
}).AddConsoleFormatter<TerminalLogger, ConsoleFormatterOptions>();
|
||||
|
||||
if(runtimeInfo.LinuxPackageType == "flatpak")
|
||||
if(runtimeInfo.LinuxPackageType is LinuxPackageType.FLATPAK)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -161,6 +171,18 @@ internal sealed class Program
|
||||
builder.Services.AddSingleton(typeof(RuntimeInfoResponse), runtimeInfo);
|
||||
builder.Services.AddMudMarkdownClipboardService<MarkdownClipboardService>();
|
||||
builder.Services.AddSingleton<SettingsManager>();
|
||||
builder.Services.AddSingleton<PromptInjectionGuardService>();
|
||||
builder.Services.AddSingleton<ToolSettingsService>();
|
||||
builder.Services.AddSingleton<WebPageRetrievalService>();
|
||||
builder.Services.AddSingleton<IToolImplementation, ReadWebPageTool>();
|
||||
builder.Services.AddSingleton<IWebSearchBackend, SearXNGSearchBackend>();
|
||||
builder.Services.AddSingleton<IWebSearchBackend, StaanSearchBackend>();
|
||||
builder.Services.AddSingleton<IWebSearchBackend, TavilySearchBackend>();
|
||||
builder.Services.AddSingleton<IToolImplementation, WebSearchTool>();
|
||||
builder.Services.AddSingleton<IToolDefinitionSource, CodeToolDefinitionSource>();
|
||||
builder.Services.AddSingleton<ToolRegistry>();
|
||||
builder.Services.AddSingleton<ToolExecutor>();
|
||||
builder.Services.AddSingleton<IToolCallingLoop, ToolCallingLoop>();
|
||||
builder.Services.AddSingleton<ThreadSafeRandom>();
|
||||
builder.Services.AddSingleton<AIJobService>();
|
||||
builder.Services.AddSingleton<AssistantSessionService>();
|
||||
@@ -173,14 +195,17 @@ internal sealed class Program
|
||||
builder.Services.AddSingleton<VisualBriefingBuildOrchestrator>();
|
||||
builder.Services.AddSingleton<VisualBriefingPreviewTokenService>();
|
||||
builder.Services.AddSingleton<IMediaTranscriptStorage, VisualBriefingTranscriptStorage>();
|
||||
builder.Services.AddSingleton<AssistantPluginInstallService>();
|
||||
builder.Services.AddSingleton<PluginInstallService>();
|
||||
builder.Services.AddSingleton<UpdatePolicy>();
|
||||
builder.Services.AddSingleton<AssistantPluginGenerationService>();
|
||||
builder.Services.AddSingleton<DataSourceService>();
|
||||
builder.Services.AddSingleton<DataSourceEmbeddingService>();
|
||||
builder.Services.AddSingleton<DataSourceLocalRetrievalService>();
|
||||
builder.Services.AddSingleton<DirectChatService>();
|
||||
builder.Services.AddScoped<PandocAvailabilityService>();
|
||||
builder.Services.AddTransient<HTMLParser>();
|
||||
|
||||
// Stateless: every method works on its arguments alone, so one instance serves everyone.
|
||||
builder.Services.AddSingleton<HTMLParser>();
|
||||
builder.Services.AddTransient<AgentDataSourceSelection>();
|
||||
builder.Services.AddTransient<AgentRetrievalContextValidation>();
|
||||
builder.Services.AddTransient<AgentTextContentCleaner>();
|
||||
@@ -194,6 +219,15 @@ internal sealed class Program
|
||||
builder.Services.AddSingleton<DatabaseClientProvider>();
|
||||
builder.Services.AddHostedService<GlobalShortcutService>(serviceProvider => serviceProvider.GetRequiredService<GlobalShortcutService>());
|
||||
builder.Services.AddHostedService<RustAvailabilityMonitorService>();
|
||||
builder.Services.AddScoped<NativeShareService>();
|
||||
builder.Services.AddScoped<PluginShareService>();
|
||||
|
||||
//
|
||||
// One circuit state per circuit, and the handler which keeps it up to date. Both are scoped,
|
||||
// because the circuit is the scope: every browser window gets its own pair.
|
||||
//
|
||||
builder.Services.AddScoped<CircuitStateService>();
|
||||
builder.Services.AddScoped<CircuitHandler, AIStudioCircuitHandler>();
|
||||
|
||||
// ReSharper disable AccessToDisposedClosure
|
||||
builder.Services.AddHostedService<RustService>(_ => rust);
|
||||
@@ -202,6 +236,13 @@ internal sealed class Program
|
||||
builder.Services.AddRazorComponents()
|
||||
.AddInteractiveServerComponents(options =>
|
||||
{
|
||||
//
|
||||
// We keep disconnected circuits for a long time on purpose: when the machine goes to
|
||||
// sleep, the WebView loses its connection. Without this retention period, the user would
|
||||
// return to a lost app state after waking up the machine (cf. issue #849). Since AI Studio
|
||||
// is a single-user desktop app, at most two circuits are retained, which bounds the memory
|
||||
// this costs us.
|
||||
//
|
||||
options.DisconnectedCircuitRetentionPeriod = TimeSpan.FromDays(30);
|
||||
options.DisconnectedCircuitMaxRetained = 2;
|
||||
})
|
||||
@@ -235,7 +276,22 @@ internal sealed class Program
|
||||
// Get a program logger:
|
||||
var programLogger = app.Services.GetRequiredService<ILogger<Program>>();
|
||||
programLogger.LogInformation("Starting the AI Studio server.");
|
||||
|
||||
|
||||
//
|
||||
// Observe tasks whose exceptions nobody awaited. We register this before the server starts:
|
||||
// otherwise, everything the startup does — the plugin system, the first message bus traffic —
|
||||
// would fault outside of this handler. The sender of such a task says nothing about where it
|
||||
// came from, which is why we log each inner exception with its own stack trace.
|
||||
//
|
||||
TaskScheduler.UnobservedTaskException += (sender, taskArgs) =>
|
||||
{
|
||||
programLogger.LogError(taskArgs.Exception, $"Unobserved task exception by sender '{sender ?? "n/a"}'.");
|
||||
foreach (var innerException in taskArgs.Exception.Flatten().InnerExceptions)
|
||||
programLogger.LogError(innerException, $"Unobserved task exception detail: {innerException.GetType().FullName}.");
|
||||
|
||||
taskArgs.SetObserved();
|
||||
};
|
||||
|
||||
// Store the service provider (DI). We need it later for some classes,
|
||||
// which are not part of the request pipeline:
|
||||
SERVICE_PROVIDER = app.Services;
|
||||
@@ -288,13 +344,7 @@ internal sealed class Program
|
||||
await encryptionInitializer;
|
||||
await rust.AppIsReady();
|
||||
programLogger.LogInformation("The AI Studio server is ready.");
|
||||
|
||||
TaskScheduler.UnobservedTaskException += (sender, taskArgs) =>
|
||||
{
|
||||
programLogger.LogError(taskArgs.Exception, $"Unobserved task exception by sender '{sender ?? "n/a"}'.");
|
||||
taskArgs.SetObserved();
|
||||
};
|
||||
|
||||
|
||||
await serverTask;
|
||||
|
||||
RUST_SERVICE.Dispose();
|
||||
@@ -302,4 +352,4 @@ internal sealed class Program
|
||||
PluginFactory.Dispose();
|
||||
programLogger.LogInformation("The AI Studio server was stopped.");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user