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

ApiFacada in ServerUtils verschoben + ServerUtils/README angelegt

Browse Source
This commit is contained in:
Rene Evertz
2025-09-18 16:34:19 +02:00
parent 68866e8f28
commit 7b2961e28a
13 changed files with 1065 additions and 1080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AICore/AICore.csproj
View File

@@ -34,12 +34,14 @@
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.2\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.IO.Pipelines, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.9.0.2\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Text.Encodings.Web, Version=9.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.9.0.2\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
@@ -113,9 +115,9 @@
<EmbeddedResource Include="Prompt\SystemPrompts\system_prompt3.txt" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ServiceUtils\ServiceUtils.csproj">
<ProjectReference Include="..\ServiceUtils\ServerUtils.csproj">
<Project>{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}</Project>
<Name>ServiceUtils</Name>
<Name>ServerUtils</Name>
</ProjectReference>
<ProjectReference Include="..\Shared\Shared.csproj">
<Project>{2f50b83d-a3f0-4ec4-979a-3f9b7e3d8ed4}</Project>

2
AICore/Facade/LLM/OllamaApiClient.cs
View File

@@ -6,8 +6,8 @@ using System.Collections.Generic;
using System;
using System.Linq;
using System.Net.Sockets;
using BeWo.ServiceUtils.ApiFacade;
using System.Net;
using BS.Shared.ApiFacade;
namespace AICore.Facade.LLM
{

4
AICore/Facade/LLM/OpenWebApiClient.cs
View File

@@ -1,5 +1,4 @@
using BS.Shared.ApiFacade;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts;
using BS.Shared.DataContracts.Feature.AI;
using BS.Shared.Extensions;
using BS.Shared.Interface;
@@ -8,6 +7,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text.Json;
using BeWo.ServiceUtils.ApiFacade;
namespace AICore.Facade.LLM
{

4
BeWoAI.sln
View File

@@ -47,7 +47,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Features", "Features", "{83
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AICore", "AICore\AICore.csproj", "{69D70CA9-0DF9-419E-BFAF-F4539F129BD9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceUtils", "ServiceUtils\ServiceUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServerUtils", "ServiceUtils\ServerUtils.csproj", "{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AI", "AI", "{084C391D-FCE1-4984-87FA-F8F9CFCC6A4F}"
EndProject
@@ -255,7 +255,7 @@ Global
{83C43FEC-233D-49EF-BD23-BF842A3EBDF5} = {B331128C-7E9F-4BDC-B509-A8DAE1B94E5C}
{830D2912-108B-4946-A3BE-CE4ECD50819F} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {830D2912-108B-4946-A3BE-CE4ECD50819F}
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {B6039E62-D43E-477A-BE82-EADB1057A3A2}
{EC2349FB-7FE0-4AD1-B28B-A7A27AF80A57} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A}
{084C391D-FCE1-4984-87FA-F8F9CFCC6A4F} = {CCD6B644-49E7-4A11-BD8F-607088A4AC83}
{68C1F8EA-7828-4E46-8F04-91105C55860E} = {084C391D-FCE1-4984-87FA-F8F9CFCC6A4F}
EndGlobalSection

2
Controls/Controls.csproj
View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BeWo.Controls</RootNamespace>
<AssemblyName>BeWo.Controls</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>

1
Service/Service.csproj
View File

@@ -611,7 +611,6 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="Api\ErrorExtractor\" />
<Folder Include="ServiceUtils\API\" />
<Folder Include="ServiceUtils\Generell\" />
<Folder Include="Utils\" />

2
Shared/ApiFacade/HttpClientFacade.cs → ServiceUtils/ApiFacade/HttpClientFacade.cs
View File

@@ -17,7 +17,7 @@ using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.ApiFacade
namespace BeWo.ServiceUtils.ApiFacade
{
public class HttpClientFacade
{

9
Shared/ApiFacade/JsonHttpClientFacade.cs → ServiceUtils/ApiFacade/JsonHttpClientFacade.cs
View File

@@ -1,13 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.IO;
using Newtonsoft.Json;
namespace BS.Shared.ApiFacade
namespace BeWo.ServiceUtils.ApiFacade
{
public class JsonHttpClientFacade : HttpClientFacade
{

2
Shared/ApiFacade/WebClientFacade.cs → ServiceUtils/ApiFacade/WebClientFacade.cs
View File

@@ -9,7 +9,7 @@ using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
namespace BS.Shared.ApiFacade
namespace BeWo.ServiceUtils.ApiFacade
{
public class WebClientFacade
{

3
ServiceUtils/README.txt Normal file
View File

@@ -0,0 +1,3 @@
Dient als Shared Ersatz auf der Server Ebene für Objekte, die eins der folgenden Eigenschaften erfüllt:
- Benötigt .NET 4.7.2 (ApiFacade)
- MergedConfig (Wird an mehreren Stellen gebraucht, kann auch über Parameter übergeben werden theoretisch)

4
ServiceUtils/ServiceUtils.csproj → ServiceUtils/ServerUtils.csproj
View File

@@ -36,6 +36,7 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@@ -43,6 +44,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ApiFacade\HttpClientFacade.cs" />
<Compile Include="ApiFacade\JsonHttpClientFacade.cs" />
<Compile Include="ApiFacade\WebClientFacade.cs" />
<Compile Include="Core\MergedConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

2101
Shared/Core/EnumTranslations.cs
View File

File diff suppressed because it is too large Load Diff

5
Shared/Shared.csproj
View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BS.Shared</RootNamespace>
<AssemblyName>BS.Shared</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
@@ -136,9 +136,6 @@
<Reference Include="System.Xaml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ApiFacade\HttpClientFacade.cs" />
<Compile Include="ApiFacade\JsonHttpClientFacade.cs" />
<Compile Include="ApiFacade\WebClientFacade.cs" />
<Compile Include="AppSender\GkvSender.cs" />
<Compile Include="Attributes\RequireNoTenantAttribute.cs" />
<Compile Include="Attributes\RequirePermissionAttribute.cs" />