Merge branch 'main' into cleanup_builds_&_engines

.github/workflows/ci-e2e.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 60
 
     env:
       SERVAL_CLIENT_ID: ${{ secrets.SERVAL_CLIENT_ID }}

.vscode/settings.json

@@ -28,6 +28,7 @@
     "ptcc",
     "Rebinder",
     "stylesheet",
+    "timespan",
     "upserted",
     "USFM"
   ],

README.md

@@ -60,15 +60,13 @@ There are 3 different environments that Serval is deployed to:
 - Run `kubectl config use-context dallas-rke`
 - First, startup the storage (using internal qa for example)
 - `helm install serval-pvc deploy/serval-pvc -n nlp -f deploy/qa-int-values.yaml`
-- Then, startup the database (give it 60 seconds)
-- `helm install mongo deploy/mongo -n nlp -f deploy/qa-int-values.yaml`
 - Now you can turn on Serval
 - `helm install serval deploy/serval -n nlp -f deploy/qa-int-values.yaml`
 
 ### To update the cluster
 - To upgrade Serval:
   - For QA internal Run:
-    - `kubectl config use-context dallas-rke`
+    - `kubectl config use-context dallas-stage`
     - `helm upgrade serval deploy/serval -n nlp -f deploy/qa-int-values.yaml`
   - For QA external Run:
     - `kubectl config use-context dallas-rke`

Serval.sln

@@ -86,6 +86,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C3A14577-A65
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.ServiceToolkit", "src\ServiceToolkit\src\SIL.ServiceToolkit\SIL.ServiceToolkit.csproj", "{0E40F959-C641-40A2-9750-B17A4F9F9E55}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{1DB5E6D1-17A8-4FF2-B90A-C5DFBEF63126}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.ServiceToolkit.Tests", "src\ServiceToolkit\test\SIL.ServiceToolkit.Tests\SIL.ServiceToolkit.Tests.csproj", "{C50ED15A-876D-42BF-980A-388E8C49C78D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -180,6 +184,10 @@ Global
 		{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E40F959-C641-40A2-9750-B17A4F9F9E55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C50ED15A-876D-42BF-980A-388E8C49C78D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C50ED15A-876D-42BF-980A-388E8C49C78D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C50ED15A-876D-42BF-980A-388E8C49C78D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C50ED15A-876D-42BF-980A-388E8C49C78D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -215,6 +223,8 @@ Global
 		{10657805-48F1-4205-B8F5-79447F6EF620} = {25CDB05B-4E24-4A6E-933E-1E0BEC97D74D}
 		{C3A14577-A654-4604-818C-4E683DD45A51} = {EA69B41C-49EF-4017-A687-44B9DF37FF98}
 		{0E40F959-C641-40A2-9750-B17A4F9F9E55} = {C3A14577-A654-4604-818C-4E683DD45A51}
+		{1DB5E6D1-17A8-4FF2-B90A-C5DFBEF63126} = {EA69B41C-49EF-4017-A687-44B9DF37FF98}
+		{C50ED15A-876D-42BF-980A-388E8C49C78D} = {1DB5E6D1-17A8-4FF2-B90A-C5DFBEF63126}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9F18C25E-E140-43C3-B177-D562E1628370}

deploy/qa-ext-values.yaml

@@ -1,15 +1,15 @@
 externalHost: qa.serval-api.org
 environment: Production
-deploymentVersion: '1.6.QA3'
+deploymentVersion: '1.7.QA7'
 alertEmail: [email protected]
 emailsToAlert: [email protected]
 enableTls: true
 namespace: serval
 auth0Domain: dev-sillsdev.auth0.com
 lokiTenent: serval-tenant
 lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local
-servalImage: ghcr.io/sillsdev/serval:1.6.3
-ClearMLDockerImage: ghcr.io/sillsdev/machine.py:1.6.3
+servalImage: ghcr.io/sillsdev/serval:1.7.7
+ClearMLDockerImage: ghcr.io/sillsdev/machine.py:1.7.2
 ClearMLQueue: production
 MongoConnectionPrefix: qa_
 SharedFileLocation: s3://silnlp/ext-qa/

deploy/qa-int-values.yaml

@@ -8,11 +8,11 @@ namespace: nlp
 auth0Domain: sil-appbuilder.auth0.com
 lokiTenent: nlp-tenant
 lokiUrl: http://loki-distributed-gateway.loki.svc.cluster.local
-servalImage: ghcr.io/sillsdev/serval:1.6.1
+servalImage: ghcr.io/sillsdev/serval:1.7.0
 ClearMLDockerImage: ghcr.io/sillsdev/machine.py:1.6.3
 ClearMLQueue: lambert_24gb
 MongoConnectionPrefix: qa_int_
 SharedFileLocation: s3://silnlp/int-qa/
-servalClaimSize: 1Gi
-machineClaimSize: 2Gi
+servalClaimSize: 5Gi
+machineClaimSize: 20Gi
 enableEcho: true

deploy/serval-pvc/templates/persistent-volume-claims.yaml

@@ -35,17 +35,4 @@ spec:
       - ReadWriteMany
   resources:
     requests:
-      storage: 50M
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: serval-mongo-claim
-  namespace: {{ .Values.namespace}}
-spec:
-  storageClassName: "longhorn"
-  accessModes:
-      - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Gi
+      storage: 55M

deploy/serval/templates/fluentd-flows.yaml

@@ -26,21 +26,3 @@ spec:
           - echo
         hosts: []
         labels: {}
----
-apiVersion: logging.banzaicloud.io/v1beta1
-kind: Flow
-metadata:
-  name: mongo-flow
-  namespace: {{ .Values.namespace }}
-spec:
-  globalOutputRefs: []
-  localOutputRefs:
-    - {{ .Values.namespace }}-loki-output
-  match:
-    - select:
-        container_names:
-          - mongo
-        hosts: []
-        labels: {}
-status:
-  active: true

docker-compose.yml

@@ -182,4 +182,4 @@ services:
         '/bin/sh',
         '-c',
         'mongod --quiet --replSet myRS --bind_ip 0.0.0.0 & sleep 2s; mongosh --host localhost:27017 --eval '' config = { "_id" : "myRS", "members" : [{"_id" : 0,"host" : "mongo:27017"}] }; rs.initiate(config, { force: true }); '' ; sleep infinity'
-      ]
+      ]

samples/ApiExample/ApiExample.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <UserSecretsId>4d0606c3-0fc7-4d76-b43b-236485004e81</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="data\**\*.*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Duende.AccessTokenManagement" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageReference Include="Serval.Client" Version="1.8.0" />
+  </ItemGroup>
+
+</Project>

samples/ApiExample/ApiExample.sln

@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35327.3
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiExample", "ApiExample.csproj", "{F80F8853-776B-4C3A-B789-B8FD5820150A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F80F8853-776B-4C3A-B789-B8FD5820150A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F80F8853-776B-4C3A-B789-B8FD5820150A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F80F8853-776B-4C3A-B789-B8FD5820150A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F80F8853-776B-4C3A-B789-B8FD5820150A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {72D18D80-E951-41EE-8A1F-97B2B72615AD}
+	EndGlobalSection
+EndGlobal