Meleki
d6d7b6c04f
Execute-Tools (execute, background_execute, SessionEndpoint.HandleExec): - Windows: Befehl in temp .cmd-Datei statt cmd.exe stdin (interaktiver Modus, &-Parsing, Mehr?-Prompt) oder ShellArguments (falsches \"-Escaping für cmd.exe) - Linux: weiterhin stdin an /bin/bash (funktioniert zuverlässig) - Script-Cleanup in allen Codepfaden (Success, Timeout, Error) Neues Tool background_execute: - Startet Prozesse losgelöst ohne Warten, gibt PID zurück - Temp-Script-Ansatz: funktioniert auch mit mehrzeiligen Befehlen - Windows: .cmd mit del "%~f0" (Selbstlöschung) - Linux: .sh mit rm -f (Selbstlöschung) Konfigurierbarer Execute-Timeout: - Neues Server-Setting ExecuteTimeout (Default: 180s) - IConfiguration in ToolService injected - Tool-Description zeigt aktuellen Timeout dynamisch an SessionEndpoint.HandleExec (foreground): - Pipe-Deadlock-Fix: ReadToEndAsync vor WaitForExitAsync - Gleicher Temp-Script-Ansatz wie ToolService WorkspaceHelper.ShellArguments() entfernt (keine Aufrufer mehr)
93 lines
3.4 KiB
C#
93 lines
3.4 KiB
C#
using System;
|
||
using System.IO;
|
||
using System.Net.Http;
|
||
using Gott.Endpoints;
|
||
using Gott.Middleware;
|
||
using Gott.Services;
|
||
using Microsoft.AspNetCore.Builder;
|
||
using Microsoft.Extensions.Configuration;
|
||
using Microsoft.Extensions.DependencyInjection;
|
||
|
||
var builder = WebApplication.CreateBuilder(args);
|
||
builder.Services.AddHttpClient();
|
||
|
||
var dataDir = Path.Combine(AppContext.BaseDirectory, "data");
|
||
Directory.CreateDirectory(dataDir);
|
||
|
||
var dbPath = Path.Combine(dataDir, "gott.db");
|
||
var authService = new AuthService(dbPath);
|
||
var dbService = new DatabaseService(dbPath);
|
||
dbService.EnsureDefaultUser(authService);
|
||
|
||
builder.Services.AddSingleton(authService);
|
||
builder.Services.AddSingleton(dbService);
|
||
builder.Services.AddSingleton(new ImageService());
|
||
builder.Services.AddSingleton(new StreamingTracker());
|
||
var memoryService = new MemoryService(dataDir);
|
||
var skillService = new SkillService(dataDir);
|
||
builder.Services.AddSingleton(memoryService);
|
||
builder.Services.AddSingleton(skillService);
|
||
|
||
// Shared Services
|
||
var toolService = new ToolService(builder.Configuration);
|
||
builder.Services.AddSingleton(toolService);
|
||
var maxHistory = builder.Configuration.GetValue<int>("MaxHistory", 120);
|
||
var reminderInterval = builder.Configuration.GetValue<int>("ReminderInterval", 30);
|
||
var chatService = new ChatService(dbService, toolService, memoryService, skillService, maxHistory, reminderInterval);
|
||
builder.Services.AddSingleton(chatService);
|
||
|
||
// AnthropicService (Singleton – shared zwischen ChatEndpoint und TelegramService)
|
||
var anthropicToken = builder.Configuration["AnthropicToken"] ?? "";
|
||
var payloadLogging = builder.Configuration.GetValue<bool>("PayloadLogging", false);
|
||
var payloadLoggingGzip = builder.Configuration.GetValue<bool>("PayloadLoggingGzip", false);
|
||
builder.Services.AddSingleton<AnthropicService>(sp =>
|
||
new AnthropicService(
|
||
sp.GetRequiredService<IHttpClientFactory>(),
|
||
anthropicToken, toolService, dbService, memoryService,
|
||
payloadLogging, payloadLoggingGzip));
|
||
|
||
// Telegram Bot (pro Session – Token aus Session-Config)
|
||
var maxIterations = builder.Configuration.GetValue<int>("MaxIterations", 100);
|
||
builder.Services.AddSingleton<TelegramService>(sp =>
|
||
new TelegramService(
|
||
sp.GetRequiredService<IHttpClientFactory>(),
|
||
dbService, chatService,
|
||
sp.GetRequiredService<AnthropicService>(),
|
||
maxIterations));
|
||
|
||
// Krea Image Generation
|
||
var kreaToken = builder.Configuration["KreaToken"] ?? "";
|
||
builder.Services.AddSingleton(sp =>
|
||
new KreaService(sp.GetRequiredService<IHttpClientFactory>(), kreaToken, dataDir));
|
||
|
||
// Cronjob-Service (BackgroundService)
|
||
builder.Services.AddSingleton<CronjobService>();
|
||
builder.Services.AddHostedService<CronjobService>(sp => sp.GetRequiredService<CronjobService>());
|
||
|
||
var app = builder.Build();
|
||
app.UseDefaultFiles();
|
||
app.UseStaticFiles();
|
||
app.UseMiddleware<AuthMiddleware>();
|
||
|
||
app.MapAuthEndpoints();
|
||
app.MapChatEndpoint();
|
||
app.MapHistoryEndpoint();
|
||
app.MapSessionEndpoints();
|
||
app.MapAgentEndpoints();
|
||
app.MapWorkspaceEndpoint();
|
||
app.MapInfoEndpoint();
|
||
app.MapBackupEndpoint();
|
||
app.MapSkillEndpoints();
|
||
app.MapProfileEndpoints();
|
||
app.MapSettingsEndpoints();
|
||
app.MapTelegramEndpoints();
|
||
app.MapCronjobEndpoints();
|
||
app.MapKreaEndpoints();
|
||
app.MapSharedEndpoints();
|
||
app.MapAdminEndpoints();
|
||
app.MapServerSettingsEndpoints();
|
||
app.MapOpenClawEndpoints();
|
||
|
||
var port = app.Configuration.GetValue<int>("Port", 19000);
|
||
app.Run($"http://0.0.0.0:{port}");
|