Consolidate to one Echo engine

sillsdev · Oct 9, 2024 · bb06c3f · bb06c3f
1 parent 275fe7d
commit bb06c3f
Show file tree

Hide file tree

Showing 28 changed files with 3,437 additions and 630 deletions.
diff --git a/Serval.sln b/Serval.sln
@@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Translation.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.DataFiles", "src\Serval\src\Serval.DataFiles\Serval.DataFiles.csproj", "{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EchoTranslationEngine", "src\Echo\src\EchoTranslationEngine\EchoTranslationEngine.csproj", "{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.ApiServer.IntegrationTests", "src\Serval\test\Serval.ApiServer.IntegrationTests\Serval.ApiServer.IntegrationTests.csproj", "{0C3DF75B-B022-4EFC-882C-F276F1EC8435}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.E2ETests", "src\Serval\test\Serval.E2ETests\Serval.E2ETests.csproj", "{1F020042-D7B8-4541-9691-26ECFD1FFC73}"
@@ -48,10 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.DataAccess.Tests", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serval.Shared.Tests", "src\Serval\test\Serval.Shared.Tests\Serval.Shared.Tests.csproj", "{0E220C65-AA88-450E-AFB2-844E49060B3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Echo", "Echo", "{53B18D34-B7C7-4B91-BCB0-1021170DFC65}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE90915F-E16D-479C-9568-22A08F0FD8F9}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Serval", "Serval", "{6D20F76D-9A0E-44AC-8754-B4291C75D25B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{25CDB05B-4E24-4A6E-933E-1E0BEC97D74D}"
@@ -94,11 +88,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C1EF85B4-F2C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serval.WordAlignment", "src\Serval\src\Serval.WordAlignment\Serval.WordAlignment.csproj", "{F07B5541-4BA4-4BF8-AE1A-B44BDDCEB354}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Echo", "Echo", "{22670005-758A-4595-8951-430AB7B7FE58}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Echo", "Echo", "{D201886D-9299-4758-80E8-694DBCF8DF93}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89E0A893-497E-4A2A-AA50-6E3BED754301}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0904BA95-D5BF-4AC2-A919-20A785EF45F5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EchoWordAlignmentEngine", "src\Echo\src\EchoWordAlignmentEngine\EchoWordAlignmentEngine.csproj", "{82544458-AC7F-44BF-9364-F1DDBADB8EBF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EchoEngine", "src\Echo\src\EchoEngine\EchoEngine.csproj", "{929FF600-8C7E-4498-A2A3-5534F3A3481E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -146,10 +140,6 @@ Global
 		{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C3DF75B-B022-4EFC-882C-F276F1EC8435}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -198,10 +188,10 @@ Global
 		{F07B5541-4BA4-4BF8-AE1A-B44BDDCEB354}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F07B5541-4BA4-4BF8-AE1A-B44BDDCEB354}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F07B5541-4BA4-4BF8-AE1A-B44BDDCEB354}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82544458-AC7F-44BF-9364-F1DDBADB8EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82544458-AC7F-44BF-9364-F1DDBADB8EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82544458-AC7F-44BF-9364-F1DDBADB8EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82544458-AC7F-44BF-9364-F1DDBADB8EBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{929FF600-8C7E-4498-A2A3-5534F3A3481E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{929FF600-8C7E-4498-A2A3-5534F3A3481E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{929FF600-8C7E-4498-A2A3-5534F3A3481E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{929FF600-8C7E-4498-A2A3-5534F3A3481E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -217,13 +207,11 @@ Global
 		{8FC30758-37FC-4819-805D-8EFF3DEDF05F} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
 		{539598C5-8634-4273-8714-A684622DDCFC} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
 		{4375A7BF-E3CE-4785-91E3-2ED6FCEB074F} = {25CDB05B-4E24-4A6E-933E-1E0BEC97D74D}
-		{A9D08CA2-3CF7-4BB7-A47F-5A567FFDB2CC} = {BE90915F-E16D-479C-9568-22A08F0FD8F9}
 		{0C3DF75B-B022-4EFC-882C-F276F1EC8435} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
 		{1F020042-D7B8-4541-9691-26ECFD1FFC73} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
 		{63E4D71B-11BE-4D68-A876-5B1B5F0A4C88} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
 		{71151518-8774-44D0-8E69-D77FA447BEFA} = {BA044B98-3136-4FDE-B90F-B0975758C07F}
 		{0E220C65-AA88-450E-AFB2-844E49060B3F} = {3E753B99-7C31-42AC-B02E-012B802F58DB}
-		{BE90915F-E16D-479C-9568-22A08F0FD8F9} = {53B18D34-B7C7-4B91-BCB0-1021170DFC65}
 		{25CDB05B-4E24-4A6E-933E-1E0BEC97D74D} = {6D20F76D-9A0E-44AC-8754-B4291C75D25B}
 		{3E753B99-7C31-42AC-B02E-012B802F58DB} = {6D20F76D-9A0E-44AC-8754-B4291C75D25B}
 		{92805246-5285-4F0A-9BF8-6EE4A027A41B} = {33E6965E-5A58-4C6F-882E-F17C8E88A3FF}
@@ -240,9 +228,9 @@ Global
 		{A78D900F-AE52-436C-88CE-A22EAEDECD91} = {9125C013-4F15-4761-BCD2-070524986737}
 		{C1EF85B4-F2CD-407D-904D-BAC1BCE3A64C} = {A78D900F-AE52-436C-88CE-A22EAEDECD91}
 		{F07B5541-4BA4-4BF8-AE1A-B44BDDCEB354} = {C1EF85B4-F2CD-407D-904D-BAC1BCE3A64C}
-		{22670005-758A-4595-8951-430AB7B7FE58} = {9125C013-4F15-4761-BCD2-070524986737}
-		{89E0A893-497E-4A2A-AA50-6E3BED754301} = {22670005-758A-4595-8951-430AB7B7FE58}
-		{82544458-AC7F-44BF-9364-F1DDBADB8EBF} = {89E0A893-497E-4A2A-AA50-6E3BED754301}
+		{D201886D-9299-4758-80E8-694DBCF8DF93} = {9125C013-4F15-4761-BCD2-070524986737}
+		{0904BA95-D5BF-4AC2-A919-20A785EF45F5} = {D201886D-9299-4758-80E8-694DBCF8DF93}
+		{929FF600-8C7E-4498-A2A3-5534F3A3481E} = {0904BA95-D5BF-4AC2-A919-20A785EF45F5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F18C25E-E140-43C3-B177-D562E1628370}

diff --git a/...ceToolkit/Services/BackgroundTaskQueue.cs → ...cho/src/EchoEngine/BackgroundTaskQueue.cs b/...ceToolkit/Services/BackgroundTaskQueue.cs → ...cho/src/EchoEngine/BackgroundTaskQueue.cs
@@ -1,4 +1,4 @@
-namespace SIL.ServiceToolkit.Services;
+namespace EchoEngine;
 
 public class BackgroundTaskQueue
 {

diff --git a/...Toolkit/Services/BackgroundTaskService.cs → ...o/src/EchoEngine/BackgroundTaskService.cs b/...Toolkit/Services/BackgroundTaskService.cs → ...o/src/EchoEngine/BackgroundTaskService.cs
@@ -1,4 +1,4 @@
-namespace SIL.ServiceToolkit.Services;
+namespace EchoEngine;
 
 public class BackgroundTaskService(
     BackgroundTaskQueue taskQueue,

diff --git a/...lationEngine/EchoTranslationEngine.csproj → src/Echo/src/EchoEngine/EchoEngine.csproj b/...lationEngine/EchoTranslationEngine.csproj → src/Echo/src/EchoEngine/EchoEngine.csproj
diff --git a/.../EchoTranslationEngine/HealthServiceV1.cs → src/Echo/src/EchoEngine/HealthServiceV1.cs b/.../EchoTranslationEngine/HealthServiceV1.cs → src/Echo/src/EchoEngine/HealthServiceV1.cs
@@ -1,6 +1,6 @@
 using Serval.Health.V1;
 
-namespace EchoTranslationEngine;
+namespace EchoEngine;
 
 public class HealthServiceV1(HealthCheckService healthCheckService) : HealthApi.HealthApiBase
 {

diff --git a/...ho/src/EchoWordAlignmentEngine/Program.cs → src/Echo/src/EchoEngine/Program.cs b/...ho/src/EchoWordAlignmentEngine/Program.cs → src/Echo/src/EchoEngine/Program.cs
@@ -1,10 +1,18 @@
+using Serval.Translation.V1;
+using Serval.WordAlignment.V1;
+
 WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-builder.Services.AddGrpcClient<WordAlignmentPlatformApi.WordAlignmentPlatformApiClient>(o =>
+builder.Services.AddGrpcClient<TranslationPlatformApi.TranslationPlatformApiClient>(o =>
 {
     o.Address = new Uri(builder.Configuration.GetConnectionString("TranslationPlatformApi")!);
 });
+builder.Services.AddGrpcClient<WordAlignmentPlatformApi.WordAlignmentPlatformApiClient>(o =>
+{
+    o.Address = new Uri(builder.Configuration.GetConnectionString("WordAlignmentPlatformApi")!);
+});
+
 builder.Services.AddGrpc();
 
 builder.Services.AddHostedService<BackgroundTaskService>();
@@ -20,7 +28,9 @@
 // Configure the HTTP request pipeline.
 app.UseHttpsRedirection();
 
+app.MapGrpcService<TranslationEngineServiceV1>();
 app.MapGrpcService<WordAlignmentEngineServiceV1>();
+
 app.MapGrpcService<HealthServiceV1>();
 
 app.Run();
diff --git a/...tionEngine/Properties/launchSettings.json → ...EchoEngine/Properties/launchSettings.json b/...tionEngine/Properties/launchSettings.json → ...EchoEngine/Properties/launchSettings.json
diff --git a/...ationEngine/TranslationEngineServiceV1.cs → .../EchoEngine/TranslationEngineServiceV1.cs b/...ationEngine/TranslationEngineServiceV1.cs → .../EchoEngine/TranslationEngineServiceV1.cs
@@ -1,4 +1,6 @@
-namespace EchoTranslationEngine;
+using Serval.Translation.V1;
+
+namespace EchoEngine;
 
 public class TranslationEngineServiceV1(BackgroundTaskQueue taskQueue) : TranslationEngineApi.TranslationEngineApiBase
 {

diff --git a/src/Echo/src/EchoEngine/Usings.cs b/src/Echo/src/EchoEngine/Usings.cs
@@ -0,0 +1,6 @@
+global using System.Threading.Channels;
+global using Bugsnag.AspNet.Core;
+global using EchoEngine;
+global using Google.Protobuf.WellKnownTypes;
+global using Grpc.Core;
+global using Microsoft.Extensions.Diagnostics.HealthChecks;
diff --git a/...entEngine/WordAlignmentEngineServiceV1.cs → ...choEngine/WordAlignmentEngineServiceV1.cs b/...entEngine/WordAlignmentEngineServiceV1.cs → ...choEngine/WordAlignmentEngineServiceV1.cs
@@ -1,4 +1,6 @@
-namespace EchoWordAlignmentEngine;
+using Serval.WordAlignment.V1;
+
+namespace EchoEngine;
 
 public class WordAlignmentEngineServiceV1(BackgroundTaskQueue taskQueue)
     : WordAlignmentEngineApi.WordAlignmentEngineApiBase

diff --git a/...lationEngine/appsettings.Development.json → ...c/EchoEngine/appsettings.Development.json b/...lationEngine/appsettings.Development.json → ...c/EchoEngine/appsettings.Development.json
diff --git a/...slationEngine/appsettings.Production.json → ...rc/EchoEngine/appsettings.Production.json b/...slationEngine/appsettings.Production.json → ...rc/EchoEngine/appsettings.Production.json
diff --git a/...ranslationEngine/appsettings.Staging.json → ...o/src/EchoEngine/appsettings.Staging.json b/...ranslationEngine/appsettings.Staging.json → ...o/src/EchoEngine/appsettings.Staging.json
diff --git a/...rc/EchoTranslationEngine/appsettings.json → src/Echo/src/EchoEngine/appsettings.json b/...rc/EchoTranslationEngine/appsettings.json → src/Echo/src/EchoEngine/appsettings.json
diff --git a/src/Echo/src/EchoTranslationEngine/Program.cs b/src/Echo/src/EchoTranslationEngine/Program.cs
diff --git a/src/Echo/src/EchoTranslationEngine/Usings.cs b/src/Echo/src/EchoTranslationEngine/Usings.cs
diff --git a/src/Echo/src/EchoWordAlignmentEngine/EchoWordAlignmentEngine.csproj b/src/Echo/src/EchoWordAlignmentEngine/EchoWordAlignmentEngine.csproj
diff --git a/src/Echo/src/EchoWordAlignmentEngine/HealthServiceV1.cs b/src/Echo/src/EchoWordAlignmentEngine/HealthServiceV1.cs
diff --git a/src/Echo/src/EchoWordAlignmentEngine/Usings.cs b/src/Echo/src/EchoWordAlignmentEngine/Usings.cs
diff --git a/src/Echo/src/EchoWordAlignmentEngine/appsettings.Development.json b/src/Echo/src/EchoWordAlignmentEngine/appsettings.Development.json
diff --git a/src/Echo/src/EchoWordAlignmentEngine/appsettings.Production.json b/src/Echo/src/EchoWordAlignmentEngine/appsettings.Production.json
diff --git a/src/Echo/src/EchoWordAlignmentEngine/appsettings.Staging.json b/src/Echo/src/EchoWordAlignmentEngine/appsettings.Staging.json
diff --git a/src/Echo/src/EchoWordAlignmentEngine/appsettings.json b/src/Echo/src/EchoWordAlignmentEngine/appsettings.json
diff --git a/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj b/src/Serval/src/Serval.ApiServer/Serval.ApiServer.csproj
@@ -47,6 +47,7 @@
 		<ProjectReference Include="..\Serval.Assessment\Serval.Assessment.csproj" />
 		<ProjectReference Include="..\Serval.DataFiles\Serval.DataFiles.csproj" />
 		<ProjectReference Include="..\Serval.Translation\Serval.Translation.csproj" />
+		<ProjectReference Include="..\Serval.WordAlignment\Serval.WordAlignment.csproj" />
 		<ProjectReference Include="..\Serval.Webhooks\Serval.Webhooks.csproj" />
 	</ItemGroup>
 

diff --git a/src/Serval/src/Serval.ApiServer/Startup.cs b/src/Serval/src/Serval.ApiServer/Startup.cs
@@ -80,11 +80,13 @@ public void ConfigureServices(IServiceCollection services)
             {
                 cfg.AddTranslationRepositories();
                 cfg.AddAssessmentRepositories();
+                cfg.AddWordAlignmentRepositories();
                 cfg.AddDataFilesRepositories();
                 cfg.AddWebhooksRepositories();
             })
             .AddTranslation()
             .AddAssessment()
+            .AddWordAlignment()
             .AddDataFiles()
             .AddWebhooks();
         services.AddTransient<IUrlService, UrlService>();
@@ -113,6 +115,7 @@ public void ConfigureServices(IServiceCollection services)
         {
             cfg.AddTranslationConsumers();
             cfg.AddAssessmentConsumers();
+            cfg.AddWordAlignmentConsumers();
             cfg.AddDataFilesConsumers();
             cfg.AddWebhooksConsumers();
         });
@@ -232,6 +235,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             x.MapControllers();
             x.MapServalTranslationServices();
             x.MapServalAssessmentServices();
+            x.MapServalWordAlignmentServices();
             x.MapHangfireDashboard();
         });