ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OpenWebUI raus, Ollama2 ordentlich rein.

Browse Source 
- UnitTests fehlen
This commit is contained in:
Rene Evertz
2025-12-02 17:32:35 +01:00
parent 20c8798cdf
commit ef6d2c49a1
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Host/Web.Deploy.config
View File

@@ -388,8 +388,8 @@
<add key="SendMailModuleGkvSender" value="noreply@bewoplaner.de" />
<add key="SendMailModuleGkvReceiver" value="dakota.exchange@ownsoft.de" />
<add key="OpenWebUIUrl" value="https://owui1.ownsoft.de/"/>
<add key="OllamaUrl" value="https://w2.ownchat.de" />
<add key="Ollama2Url" value="https://ai3.ownsoft.de" />
<add key="XRechnungApiUrl" value="https://test2.evplaner.de/xrg/"/>
<add key="StoredTenantFilesFolderPath" value="C:\BeWoPlaner\StoredTenantFiles"/>

1
Host/Web.Secrets.config.template
View File

@@ -8,6 +8,7 @@
<appSettings>
<add key="OpenWebUIKey" value=""/>
<add key="OllamaKey" value=""/>
<add key="Ollama2Key" value=""/>
<add key="GetGkvSumApiKey" value=""/>
<add key="DownloadReportApiKey" value=""/>
<add key="OpenrouteServiceApiKey" value="" />

1
Host/Web.config
View File

@@ -397,7 +397,6 @@
<add key="SendMailModuleGkvSender" value="noreply@bewoplaner.de" />
<add key="SendMailModuleGkvReceiver" value="dakota.exchange@ownsoft.de" />
<!--<add key="OpenWebUIUrl" value="https://owui1.ownsoft.de/" />-->
<add key="OllamaUrl" value="https://w2.ownchat.de" />
<add key="Ollama2Url" value="https://ai3.ownsoft.de" />

3
Service/BeWoServiceEnums.cs
View File

@@ -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,

12
Service/ServiceProxy/ServiceFacade.cs
View File

@@ -11,10 +11,10 @@ namespace BeWo.Service.ServiceProxy
{
public static class ServiceFacade
{
private static readonly Lazy<OpenWebApiClient> _OpenWebApiClient = new Lazy<OpenWebApiClient>(()
=> new OpenWebApiClient(
MergedConfig.GetSetting(WebConfigSetting.OpenWebUIUrl),
MergedConfig.GetSecretSetting(WebSecretConfigSetting.OpenWebUIKey)));
//private static readonly Lazy<OpenWebApiClient> _OpenWebApiClient = new Lazy<OpenWebApiClient>(()
// => new OpenWebApiClient(
// MergedConfig.GetSetting(WebConfigSetting.OpenWebUIUrl),
// MergedConfig.GetSecretSetting(WebSecretConfigSetting.OpenWebUIKey)));
private static readonly Lazy<OllamaApiClient> _OllamaApiClient = new Lazy<OllamaApiClient>(()
=> new OllamaApiClient(
@@ -24,13 +24,13 @@ namespace BeWo.Service.ServiceProxy
private static readonly Lazy<OllamaApiClient> _Ollama2ApiClient = new Lazy<OllamaApiClient>(()
=> new OllamaApiClient(
MergedConfig.GetSetting(WebConfigSetting.Ollama2Url),
MergedConfig.GetSecretSetting(WebSecretConfigSetting.OllamaKey),
MergedConfig.GetSecretSetting(WebSecretConfigSetting.Ollama2Key),
AiModelSource.ollama2));
private static readonly Lazy<XRechnungApiClient> _XRechnungFacade = new Lazy<XRechnungApiClient>(()
=> 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;