From ef6d2c49a1283b62bcfceecf221b29ea90028488 Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Tue, 2 Dec 2025 17:32:35 +0100 Subject: [PATCH] OpenWebUI raus, Ollama2 ordentlich rein. - UnitTests fehlen --- Host/Web.Deploy.config | 2 +- Host/Web.Secrets.config.template | 1 + Host/Web.config | 1 - Service/BeWoServiceEnums.cs | 3 +-- Service/ServiceProxy/ServiceFacade.cs | 12 ++++++------ 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Host/Web.Deploy.config b/Host/Web.Deploy.config index 4bc80815b..d7784c175 100644 --- a/Host/Web.Deploy.config +++ b/Host/Web.Deploy.config @@ -388,8 +388,8 @@ - + diff --git a/Host/Web.Secrets.config.template b/Host/Web.Secrets.config.template index ef52dc374..c1da7df74 100644 --- a/Host/Web.Secrets.config.template +++ b/Host/Web.Secrets.config.template @@ -8,6 +8,7 @@ + diff --git a/Host/Web.config b/Host/Web.config index 8bd36738b..1a6eb2811 100644 --- a/Host/Web.config +++ b/Host/Web.config @@ -397,7 +397,6 @@ - diff --git a/Service/BeWoServiceEnums.cs b/Service/BeWoServiceEnums.cs index 6d4a327ae..d9b797b25 100644 --- a/Service/BeWoServiceEnums.cs +++ b/Service/BeWoServiceEnums.cs @@ -9,7 +9,6 @@ namespace BeWo.Service { public enum WebConfigSetting { - OpenWebUIUrl, OllamaUrl, Ollama2Url, XRechnungApiUrl, @@ -23,8 +22,8 @@ namespace BeWo.Service public enum WebSecretConfigSetting { None = -1, - OpenWebUIKey, OllamaKey, + Ollama2Key, GetGkvSumApiKey, DownloadReportApiKey, OpenrouteServiceApiKey, diff --git a/Service/ServiceProxy/ServiceFacade.cs b/Service/ServiceProxy/ServiceFacade.cs index 59a9698eb..8803c75da 100644 --- a/Service/ServiceProxy/ServiceFacade.cs +++ b/Service/ServiceProxy/ServiceFacade.cs @@ -11,10 +11,10 @@ namespace BeWo.Service.ServiceProxy { public static class ServiceFacade { - private static readonly Lazy _OpenWebApiClient = new Lazy(() - => new OpenWebApiClient( - MergedConfig.GetSetting(WebConfigSetting.OpenWebUIUrl), - MergedConfig.GetSecretSetting(WebSecretConfigSetting.OpenWebUIKey))); + //private static readonly Lazy _OpenWebApiClient = new Lazy(() + // => new OpenWebApiClient( + // MergedConfig.GetSetting(WebConfigSetting.OpenWebUIUrl), + // MergedConfig.GetSecretSetting(WebSecretConfigSetting.OpenWebUIKey))); private static readonly Lazy _OllamaApiClient = new Lazy(() => new OllamaApiClient( @@ -24,13 +24,13 @@ namespace BeWo.Service.ServiceProxy private static readonly Lazy _Ollama2ApiClient = new Lazy(() => new OllamaApiClient( MergedConfig.GetSetting(WebConfigSetting.Ollama2Url), - MergedConfig.GetSecretSetting(WebSecretConfigSetting.OllamaKey), + MergedConfig.GetSecretSetting(WebSecretConfigSetting.Ollama2Key), AiModelSource.ollama2)); private static readonly Lazy _XRechnungFacade = new Lazy(() => new XRechnungApiClient()); - public static OpenWebApiClient OpenWebApiClient => _OpenWebApiClient.Value; + public static OpenWebApiClient OpenWebApiClient => null; public static OllamaApiClient OllamaApiClient => _OllamaApiClient.Value; public static OllamaApiClient Ollama2ApiClient => _Ollama2ApiClient.Value; public static XRechnungApiClient XRechnung => _XRechnungFacade.Value;