diff --git a/BeWo.sln b/BeWo.sln index 6f5aa1aad..4e739dffc 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -333,7 +333,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPZLeverkusen", "ReportImp\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weitblick-ambulantBeWo", "ReportImp\Weitblick-ambulantBeWo\Weitblick-ambulantBeWo.csproj", "{2E99BA67-61A2-47BD-8412-6ECBC126D83E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KomMitBewo", "ReportImp\KomMitBewo\KomMitBewo.csproj", "{1A585E99-09AB-4924-8FB9-9C9D1FE48044}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KommMitBewo", "ReportImp\KomMitBewo\KommMitBewo.csproj", "{1A585E99-09AB-4924-8FB9-9C9D1FE48044}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skmRheydt", "ReportImp\skmRheydt\skmRheydt.csproj", "{B9C896DD-8C7D-4F37-B826-203D2E83D650}" EndProject @@ -377,8 +377,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasAhlen", "ReportImp\C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TabulaRasa", "ReportImp\TabulaRasa\TabulaRasa.csproj", "{8E7F125B-32E9-4D59-A47A-C0994A980CD3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPZLeverkusen2", "SPZLeverkusen2\SPZLeverkusen2.csproj", "{74040CE0-1D24-4F47-91B9-7F166EADBC61}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatController", "..\Chat\ChatController\ChatController.csproj", "{8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PraxisPusteblume", "ReportImp\PraxisPusteblume\PraxisPusteblume.csproj", "{A6E699B3-8399-4B8D-90F1-119B021F3D44}" @@ -441,8 +439,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkmLeverkusen", "ReportImp\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmpathieFachassistenz", "ReportImp\EmpathieFachassistenz\EmpathieFachassistenz.csproj", "{F618F17B-5905-4D09-A976-733011945A9B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LebenUndWohnenChristianWilke", "ReportImp\LebenUndWohnenChristianWilke\LebenUndWohnenChristianWilke.csproj", "{48324B9E-4EC0-47B9-BBA7-6FD61384D25A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasverbandDuerenJuelichEV", "ReportImp\CaritasverbandDuerenJuelichEV\CaritasverbandDuerenJuelichEV.csproj", "{86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KoelnerBeWoSelbstbestimmtLeben", "ReportImp\KoelnerBeWoSelbstbestimmtLeben\KoelnerBeWoSelbstbestimmtLeben.csproj", "{FE240F9F-CC85-4F7D-9080-BEEBE76B0735}" @@ -507,8 +503,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutismusLeben", "ReportImp\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LeWoAachen", "ReportImp\LeWoAachen\LeWoAachen.csproj", "{C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ToprakGmbH", "ReportImp\ToprakGmbH\ToprakGmbH.csproj", "{12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlzeyTeilhabe", "ReportImp\AlzeyTeilhabe\AlzeyTeilhabe.csproj", "{D173B437-EAD2-4535-B59D-76737600E058}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChristopherusHausFamilienhilfe", "ReportImp\ChristopherusHausFamilienhilfe\ChristopherusHausFamilienhilfe.csproj", "{B104F622-7BE6-4DFE-9E20-32915507860D}" @@ -3013,22 +3007,6 @@ Global {8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|x86.ActiveCfg = Release|Any CPU {8E7F125B-32E9-4D59-A47A-C0994A980CD3}.Release|x86.Build.0 = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|.NET.ActiveCfg = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|.NET.Build.0 = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|x86.ActiveCfg = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Debug|x86.Build.0 = Debug|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|.NET.ActiveCfg = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|.NET.Build.0 = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Any CPU.Build.0 = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|x86.ActiveCfg = Release|Any CPU - {74040CE0-1D24-4F47-91B9-7F166EADBC61}.Release|x86.Build.0 = Release|Any CPU {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.ActiveCfg = Debug|Any CPU {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|.NET.Build.0 = Debug|Any CPU {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -3525,22 +3503,6 @@ Global {F618F17B-5905-4D09-A976-733011945A9B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F618F17B-5905-4D09-A976-733011945A9B}.Release|x86.ActiveCfg = Release|Any CPU {F618F17B-5905-4D09-A976-733011945A9B}.Release|x86.Build.0 = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|.NET.ActiveCfg = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|.NET.Build.0 = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|x86.ActiveCfg = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Debug|x86.Build.0 = Debug|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|.NET.ActiveCfg = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|.NET.Build.0 = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|Any CPU.Build.0 = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|x86.ActiveCfg = Release|Any CPU - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A}.Release|x86.Build.0 = Release|Any CPU {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|.NET.ActiveCfg = Debug|Any CPU {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|.NET.Build.0 = Debug|Any CPU {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -4053,22 +4015,6 @@ Global {C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A}.Release|Mixed Platforms.Build.0 = Release|Any CPU {C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A}.Release|x86.ActiveCfg = Release|Any CPU {C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A}.Release|x86.Build.0 = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|.NET.ActiveCfg = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|.NET.Build.0 = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|x86.ActiveCfg = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Debug|x86.Build.0 = Debug|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|.NET.ActiveCfg = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|.NET.Build.0 = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Any CPU.Build.0 = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.ActiveCfg = Release|Any CPU - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B}.Release|x86.Build.0 = Release|Any CPU {D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.ActiveCfg = Debug|Any CPU {D173B437-EAD2-4535-B59D-76737600E058}.Debug|.NET.Build.0 = Debug|Any CPU {D173B437-EAD2-4535-B59D-76737600E058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -5021,7 +4967,6 @@ Global {888961E7-A394-4F3B-A667-09EA2F80ED4B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {96A3E6E3-3F9B-4CAB-B306-3F23DE6A40F9} = {D8A691C5-146D-4613-86CC-438F02FE9106} {8E7F125B-32E9-4D59-A47A-C0994A980CD3} = {D8A691C5-146D-4613-86CC-438F02FE9106} - {74040CE0-1D24-4F47-91B9-7F166EADBC61} = {D8A691C5-146D-4613-86CC-438F02FE9106} {8A83C4DC-A0B1-4A51-AE1D-366D7A05B298} = {E7543C39-A44C-40C9-82C9-E7FAA2D9A852} {A6E699B3-8399-4B8D-90F1-119B021F3D44} = {D8A691C5-146D-4613-86CC-438F02FE9106} {E590CC37-E2A4-488F-BBA2-C70042BD488D} = {D8A691C5-146D-4613-86CC-438F02FE9106} @@ -5053,7 +4998,6 @@ Global {56602D65-47F7-4175-A065-A044FE7F6C81} = {D8A691C5-146D-4613-86CC-438F02FE9106} {E30D35E8-9B15-4345-B8B7-422415A659DA} = {D8A691C5-146D-4613-86CC-438F02FE9106} {F618F17B-5905-4D09-A976-733011945A9B} = {D8A691C5-146D-4613-86CC-438F02FE9106} - {48324B9E-4EC0-47B9-BBA7-6FD61384D25A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {86E14AC3-CD3F-4E63-8154-26DFA2E6ABEB} = {D8A691C5-146D-4613-86CC-438F02FE9106} {FE240F9F-CC85-4F7D-9080-BEEBE76B0735} = {D8A691C5-146D-4613-86CC-438F02FE9106} {976CC5EF-26C9-4415-84C6-33A450222F04} = {D8A691C5-146D-4613-86CC-438F02FE9106} @@ -5086,7 +5030,6 @@ Global {CEA6A3D2-DDD4-4699-89AE-FEF7908C46D5} = {D8A691C5-146D-4613-86CC-438F02FE9106} {54419AAB-93DB-482F-B304-035D001081DD} = {D8A691C5-146D-4613-86CC-438F02FE9106} {C9CDE69B-D3A1-4BF7-B988-1A4ACF2D664A} = {D8A691C5-146D-4613-86CC-438F02FE9106} - {12BC3B31-7499-44EC-B7B9-E3CEB2D9997B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {D173B437-EAD2-4535-B59D-76737600E058} = {D8A691C5-146D-4613-86CC-438F02FE9106} {B104F622-7BE6-4DFE-9E20-32915507860D} = {D8A691C5-146D-4613-86CC-438F02FE9106} {39876291-220B-412E-8ADE-B7A24621656D} = {D8A691C5-146D-4613-86CC-438F02FE9106} diff --git a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs index 491630257..730f929fc 100644 --- a/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs +++ b/BeWo/ServiceProxy/GeneratedAiEnhancedService.cs @@ -192,7 +192,43 @@ namespace BeWo.ServiceProxy [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiRoutineType))] System.Collections.Generic.List ExecuteAiConversationWithRoutine(long conversation, BS.Shared.DataContracts.Feature.AI.AiViewContextDC view_context, long routine, int step); - + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/ExecuteAiConversationWithRoutineComplete", ReplyAction="http://tempuri.org/IAiEnhancedService/ExecuteAiConversationWithRoutineCompleteResponse")] + [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/ExecuteAiConversationWithRoutineCompleteBeW" + + "oFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiConfigDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiModelDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiConversationDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiConversationMessageDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiPromptbausteinFolderDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiPromptbausteinPromptDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiPromptbausteinRoutineDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiPromptbausteinRoutineStepDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Feature.AI.AiUserSettingDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Compact.CompactEmployeeDC))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary>))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFault))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Core.BeWoFaultType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiDataContextType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiModelSource))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiActionType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.TableID))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiConversationMessageRole))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ActivationTypeId))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ValueListEntryType))] + [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.AiRoutineType))] + System.Collections.Generic.List ExecuteAiConversationWithRoutineComplete(BS.Shared.AiActionType actionType, BS.Shared.DataContracts.Feature.AI.AiViewContextDC view_context, long routine); + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IAiEnhancedService/CheckContextSize", ReplyAction="http://tempuri.org/IAiEnhancedService/CheckContextSizeResponse")] [System.ServiceModel.FaultContractAttribute(typeof(BS.Shared.Core.BeWoFault), Action="http://tempuri.org/IAiEnhancedService/CheckContextSizeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BS.Shared.Core")] [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BeWoDataContract))] @@ -373,7 +409,12 @@ namespace BeWo.ServiceProxy { return base.Channel.ExecuteAiConversationWithRoutine(conversation, view_context, routine, step); } - + + public System.Collections.Generic.List ExecuteAiConversationWithRoutineComplete(BS.Shared.AiActionType actionType, BS.Shared.DataContracts.Feature.AI.AiViewContextDC view_context, long routine) + { + return base.Channel.ExecuteAiConversationWithRoutineComplete(actionType, view_context, routine); + } + public bool CheckContextSize(BS.Shared.AiActionType actionType, BS.Shared.DataContracts.Feature.AI.AiViewContextDC view_context) { return base.Channel.CheckContextSize(actionType, view_context); diff --git a/BeWoSmallReports.sln b/BeWoSmallReports.sln index bbd3443bb..6099e6ef0 100644 --- a/BeWoSmallReports.sln +++ b/BeWoSmallReports.sln @@ -316,7 +316,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SPZLeverkusen", "ReportImp\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weitblick-ambulantBeWo", "ReportImp\Weitblick-ambulantBeWo\Weitblick-ambulantBeWo.csproj", "{2E99BA67-61A2-47BD-8412-6ECBC126D83E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KomMitBewo", "ReportImp\KomMitBewo\KomMitBewo.csproj", "{1A585E99-09AB-4924-8FB9-9C9D1FE48044}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KommMitBewo", "ReportImp\KomMitBewo\KommMitBewo.csproj", "{1A585E99-09AB-4924-8FB9-9C9D1FE48044}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "skmRheydt", "ReportImp\skmRheydt\skmRheydt.csproj", "{B9C896DD-8C7D-4F37-B826-203D2E83D650}" EndProject @@ -750,8 +750,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SKFMMonheim", "ReportImp\SK EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZanderBeWo", "ReportImp\ZanderBeWo\ZanderBeWo.csproj", "{8725A58B-AB80-4906-9B13-2D4144FF09EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLWV", "ReportImp\TestLWV\TestLWV.csproj", "{BA124454-FE85-4909-8271-62544E13CAA8}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dakota", "Dakota\Dakota.csproj", "{47331732-DD96-4075-869F-83AA9F3F9937}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{3B6BAB50-8447-4CC3-90B8-E4F6FBB55F0E}" @@ -9169,30 +9167,6 @@ Global {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|Mixed Platforms.Build.0 = Release|Any CPU {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|x86.ActiveCfg = Release|Any CPU {8725A58B-AB80-4906-9B13-2D4144FF09EA}.Release|x86.Build.0 = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|.NET.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|.NET.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|x86.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Debug|x86.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|.NET.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|.NET.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|Any CPU.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|Any CPU.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|Mixed Platforms.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|Mixed Platforms.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|x86.ActiveCfg = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.DebugRemote|x86.Build.0 = Debug|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|.NET.ActiveCfg = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|.NET.Build.0 = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|Any CPU.Build.0 = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|x86.ActiveCfg = Release|Any CPU - {BA124454-FE85-4909-8271-62544E13CAA8}.Release|x86.Build.0 = Release|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.ActiveCfg = Debug|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|.NET.Build.0 = Debug|Any CPU {47331732-DD96-4075-869F-83AA9F3F9937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -9638,7 +9612,6 @@ Global {A2EFCD9D-F8BC-44FB-8FA0-708F4785808B} = {D8A691C5-146D-4613-86CC-438F02FE9106} {45389304-8557-440E-8B9B-102F34958E8A} = {D8A691C5-146D-4613-86CC-438F02FE9106} {8725A58B-AB80-4906-9B13-2D4144FF09EA} = {D8A691C5-146D-4613-86CC-438F02FE9106} - {BA124454-FE85-4909-8271-62544E13CAA8} = {D8A691C5-146D-4613-86CC-438F02FE9106} {47331732-DD96-4075-869F-83AA9F3F9937} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {3B6BAB50-8447-4CC3-90B8-E4F6FBB55F0E} = {FEB0336B-F053-40B6-92DD-7DE56AB9408A} {69D70CA9-0DF9-419E-BFAF-F4539F129BD9} = {3B6BAB50-8447-4CC3-90B8-E4F6FBB55F0E} diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 000000000..ebcc0a862 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,11 @@ + + + + true + + + + + + + diff --git a/Server/Components/AICore/AICore.csproj b/Server/Components/AICore/AICore.csproj index 99585ad6b..b7fa9702f 100644 --- a/Server/Components/AICore/AICore.csproj +++ b/Server/Components/AICore/AICore.csproj @@ -43,29 +43,10 @@ ..\..\..\Lib\log4net.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.7\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\..\..\packages\System.IO.Pipelines.9.0.7\lib\net462\System.IO.Pipelines.dll - - - False - ..\..\..\Lib\System.Memory.dll - - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - - ..\..\..\packages\System.Text.Encodings.Web.9.0.7\lib\net462\System.Text.Encodings.Web.dll - - - ..\..\..\packages\System.Text.Json.9.0.7\lib\net462\System.Text.Json.dll - @@ -142,7 +123,6 @@ - @@ -154,5 +134,10 @@ ServerUtils + + + + + \ No newline at end of file diff --git a/Server/Components/AICore/packages.config b/Server/Components/AICore/packages.config deleted file mode 100644 index 02e7c5569..000000000 --- a/Server/Components/AICore/packages.config +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Service/Plugins/AiService2.cs b/Service/Plugins/AiService2.cs index facb4ecd1..854336321 100644 --- a/Service/Plugins/AiService2.cs +++ b/Service/Plugins/AiService2.cs @@ -259,6 +259,65 @@ namespace BeWo.Service.Plugins return executePrompt(conversation, view_context, prompt.Oid.Value, routine_ent.RoutineType); } + public virtual AiConversationMessageDC[] ExecuteAiConversationWithRoutineComplete(AiActionType actionType, AiViewContextDC view_context, long routine) + { + var ai_config = GetAiConfig(); + + var routine_ent = DAOFactory.GenericDAO.LoadByID(routine); + + // Gesamter Chatverlauf über alle Schritte hinweg (analog zu ExecuteChain im ViewModel). + var history = new List(); + + for (int step = 0; step < routine_ent.Steps.Count; step++) + { + var step_ent = routine_ent.Steps[step]; + var prompt = step_ent.PromptReference; + + var custom_viewContext = new AiViewContextDC + { + References = view_context.References, + Primary = view_context.Primary + }; + + if (step > 0 && routine_ent.RoutineType == AiRoutineType.Chain) + { + custom_viewContext.Secondary = history.Last().Message; + } + else + { + custom_viewContext.Secondary = view_context.Secondary; + } + + var new_conv = createAiConversation(actionType, custom_viewContext, ai_config); + var systemPrompt = addSystemPrompt(new_conv, custom_viewContext, ai_config, prompt); + + if (routine_ent.RoutineType == AiRoutineType.Chain) + { + // Conversation = (S(n), U(n)) => A(n) + } + else if (routine_ent.RoutineType == AiRoutineType.Stack) + { + // Conversation = (S(n), U(0), A(0), U(1), ..., U(n-1), A(n-1), U(n)) => A(n) + var messages_filtered = history.Where(m => m.Role != AiConversationMessageRole.System); + + new_conv.Messages.AddRange(messages_filtered); + } + else + { + throw new ArgumentOutOfRangeException(nameof(routine_ent.RoutineType)); + } + + // Server Request - wirft bei Fehlschlag eine Exception und bricht damit den gesamten Aufruf ab. + sendNewMessage(new_conv, prompt.Prompt, false); + + history.Add(systemPrompt); + history.Add(new_conv.Messages.Last(x => x.Role == AiConversationMessageRole.User)); + history.Add(new_conv.Messages.Last(x => x.Role == AiConversationMessageRole.Assistent)); + } + + return MapperFactory.AiConversationMessage.MapToNewDCs(history).ToArray(); + } + public virtual bool CheckContextSize(AiActionType actionType, AiViewContextDC view_context) { var modell_oid_value = GetAiConfig().SelectedModel.Oid.Value; diff --git a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs index 638d625f0..64efb3377 100644 --- a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs +++ b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs @@ -72,6 +72,10 @@ namespace BeWo.Service.ServiceContracts.Enhanced [OperationContract] AiConversationMessageDC[] ExecuteAiConversationWithRoutine(long conversation, AiViewContextDC view_context, long routine, int step); + [FaultContract(typeof(BeWoFault))] + [OperationContract] + AiConversationMessageDC[] ExecuteAiConversationWithRoutineComplete(AiActionType actionType, AiViewContextDC view_context, long routine); + [FaultContract(typeof(BeWoFault))] [OperationContract] //[RequireWcfAuthorization(UserRightType.AiModuleServiceRecordChat)] diff --git a/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs index e792d81f2..b31776a00 100644 --- a/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs +++ b/Service/ServiceImplementations/Enhanced/AiEnhancedServiceImp.cs @@ -52,9 +52,12 @@ namespace BeWo.Service.ServiceImplementations.Enhanced public AiConversationMessageDC[] ExecuteAiConversationWithPrompt(long conversation, AiViewContextDC view_context, long prompt_oid) => GetAiService().ExecuteAiConversationWithPrompt(conversation, view_context, prompt_oid); - public AiConversationMessageDC[] ExecuteAiConversationWithRoutine(long conversation, AiViewContextDC view_context, long routine, int step) + public AiConversationMessageDC[] ExecuteAiConversationWithRoutine(long conversation, AiViewContextDC view_context, long routine, int step) => GetAiService().ExecuteAiConversationWithRoutine(conversation, view_context, routine, step); + public AiConversationMessageDC[] ExecuteAiConversationWithRoutineComplete(AiActionType actionType, AiViewContextDC view_context, long routine) + => GetAiService().ExecuteAiConversationWithRoutineComplete(actionType, view_context, routine); + public bool CheckContextSize(AiActionType actionType, AiViewContextDC view_context) => GetAiService().CheckContextSize(actionType, view_context);