Skip to content

Commit 8e615ee

Browse files
author
ChrisMaunder
committed
v2.5.1: Reworking modulesettings schema / correcting Promise/async dichotomy
1 parent ea23919 commit 8e615ee

File tree

226 files changed

+6027
-5400
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+6027
-5400
lines changed

‎CodeProject.AI.sln‎

Lines changed: 3 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ EndProject
1616
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demos", "demos", "{7F18EB64-C857-49C4-9380-70D3CCE6242B}"
1717
ProjectSection(SolutionItems) = preProject
1818
demos\install.bat = demos\install.bat
19-
demos\install.dev.sh = demos\install.dev.sh
19+
demos\install.sh = demos\install.sh
2020
EndProjectSection
2121
EndProject
22-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{D885EE64-C1BD-44D6-84D8-1E46806298D9}"
23-
EndProject
2422
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Javascript", "Javascript", "{3A860CDD-94B9-4002-BA08-87E8822DDE50}"
2523
ProjectSection(SolutionItems) = preProject
2624
demos\Javascript\Vision.html = demos\Javascript\Vision.html
@@ -46,38 +44,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{CB26AB
4644
EndProject
4745
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{460DB5C8-46F3-4407-A2DF-D9063D14493A}"
4846
ProjectSection(SolutionItems) = preProject
49-
.editorconfig = .editorconfig
5047
global.json = global.json
5148
LICENCE.md = LICENCE.md
5249
README.md = README.md
5350
THIRD-PARTY-NOTICES.md = THIRD-PARTY-NOTICES.md
5451
EndProjectSection
5552
EndProject
56-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_PRIVATE REPO", "_PRIVATE REPO", "{78509730-6FBA-44E5-98C0-083DB7F52027}"
57-
ProjectSection(SolutionItems) = preProject
58-
README.txt = README.txt
59-
EndProjectSection
60-
EndProject
6153
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{FF0C329F-41E8-4540-BCDB-97690911077D}"
62-
EndProject
63-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Windows", "Windows", "{83C828B9-2B1E-4982-B4B7-69D173DFBB27}"
64-
EndProject
65-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{FB0561D3-4AF8-415A-85B4-E4E9ADDC3DB2}"
6654
ProjectSection(SolutionItems) = preProject
67-
.wslconfig = .wslconfig
68-
Installers\Docker\build_docker.bat = Installers\Docker\build_docker.bat
69-
Installers\Docker\build_docker.sh = Installers\Docker\build_docker.sh
70-
Installers\Docker\build_push_docker.bat = Installers\Docker\build_push_docker.bat
71-
Installers\Docker\build_push_docker.sh = Installers\Docker\build_push_docker.sh
72-
Installers\Docker\Docker build notes.md = Installers\Docker\Docker build notes.md
73-
Installers\Docker\Dockerfile = Installers\Docker\Dockerfile
74-
Installers\Docker\Dockerfile-Arm64 = Installers\Docker\Dockerfile-Arm64
75-
Installers\Docker\Dockerfile-GPU-CUDA = Installers\Docker\Dockerfile-GPU-CUDA
76-
Installers\Docker\Dockerfile-GPU-CUDA-no-cuDNN = Installers\Docker\Dockerfile-GPU-CUDA-no-cuDNN
77-
Installers\Docker\Dockerfile-RPi64 = Installers\Docker\Dockerfile-RPi64
78-
Installers\Docker\push_docker.bat = Installers\Docker\push_docker.bat
79-
Installers\Docker\push_docker.sh = Installers\Docker\push_docker.sh
80-
Installers\Docker\README = Installers\Docker\README
55+
src\SDK\install.bat = src\SDK\install.bat
56+
src\SDK\install.sh = src\SDK\install.sh
8157
EndProjectSection
8258
EndProject
8359
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License plates", "License plates", "{D320EA6C-2388-41F7-A4D1-980192665A61}"
@@ -177,11 +153,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{1C7E
177153
src\modules\readme.txt = src\modules\readme.txt
178154
EndProjectSection
179155
EndProject
180-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "macOS", "macOS", "{31DA8C15-C038-4667-89AB-74FED47D7B51}"
181-
ProjectSection(SolutionItems) = preProject
182-
Installers\macOS\create macOS installer.html = Installers\macOS\create macOS installer.html
183-
EndProjectSection
184-
EndProject
185156
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "ALPR", "src\modules\ALPR\ALPR.pyproj", "{6AE28B59-221B-4E3D-A66C-E255B26DAC82}"
186157
EndProject
187158
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NET", "src\SDK\NET\NET.csproj", "{F7056ECA-1C9C-4544-99CA-731C944651D6}"
@@ -228,65 +199,17 @@ Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "TextSummary", "src\modules\
228199
EndProject
229200
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "TrainingObjectDetectionYOLOv5", "src\modules\TrainingObjectDetectionYOLOv5\TrainingObjectDetectionYOLOv5.pyproj", "{2DFDA382-189B-45D1-94D5-3004D1AEB73C}"
230201
EndProject
231-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Inno Setup", "Inno Setup", "{1D776E6C-8123-4EF7-9AB1-81BE0B1FB4C1}"
232-
ProjectSection(SolutionItems) = preProject
233-
Installers\Windows\Inno Setup\build_inno.bat = Installers\Windows\Inno Setup\build_inno.bat
234-
Installers\Windows\Inno Setup\ReadMe.md = Installers\Windows\Inno Setup\ReadMe.md
235-
Installers\Windows\Inno Setup\script.iss = Installers\Windows\Inno Setup\script.iss
236-
EndProjectSection
237-
EndProject
238-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Output", "Output", "{5FC5036D-2546-4A5E-B0B3-C3275E695176}"
239-
EndProject
240202
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "src\server\Server.csproj", "{BFB8AD18-8C6E-4B25-B4AA-1AAB90ADA843}"
241203
EndProject
242204
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ",vscode", ",vscode", "{CA30C07F-53CC-43F7-B1C9-4E9506E53736}"
243205
ProjectSection(SolutionItems) = preProject
244206
.vscode\launch.docker.json = .vscode\launch.docker.json
245207
.vscode\launch.json = .vscode\launch.json
246-
.vscode\ReadMe.txt = .vscode\ReadMe.txt
247208
.vscode\settings.json = .vscode\settings.json
248209
.vscode\tasks.docker.json = .vscode\tasks.docker.json
249210
.vscode\tasks.json = .vscode\tasks.json
250211
EndProjectSection
251212
EndProject
252-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{703A2403-15BC-477D-89F5-F1325F85A03D}"
253-
ProjectSection(SolutionItems) = preProject
254-
Installers\Windows\Inno Setup\assets\CodeProjectAI-install-BG.png = Installers\Windows\Inno Setup\assets\CodeProjectAI-install-BG.png
255-
Installers\Windows\Inno Setup\assets\CodeProjectAI-install-LHS.bmp = Installers\Windows\Inno Setup\assets\CodeProjectAI-install-LHS.bmp
256-
Installers\Windows\Inno Setup\assets\CodeProjectAI-install-LHS.png = Installers\Windows\Inno Setup\assets\CodeProjectAI-install-LHS.png
257-
Installers\Windows\Inno Setup\assets\CodeProjectAI-install-sidebar.png = Installers\Windows\Inno Setup\assets\CodeProjectAI-install-sidebar.png
258-
Installers\Windows\Inno Setup\assets\CodeProjectAI-install-topbanner.png = Installers\Windows\Inno Setup\assets\CodeProjectAI-install-topbanner.png
259-
Installers\Windows\Inno Setup\assets\favicon.ico = Installers\Windows\Inno Setup\assets\favicon.ico
260-
Installers\Windows\Inno Setup\assets\license.rtf = Installers\Windows\Inno Setup\assets\license.rtf
261-
Installers\Windows\Inno Setup\assets\logo.bmp = Installers\Windows\Inno Setup\assets\logo.bmp
262-
Installers\Windows\Inno Setup\assets\logo.png = Installers\Windows\Inno Setup\assets\logo.png
263-
Installers\Windows\Inno Setup\assets\logoSide.png = Installers\Windows\Inno Setup\assets\logoSide.png
264-
EndProjectSection
265-
EndProject
266-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ubuntu", "Ubuntu", "{48A09F35-2977-4D23-AF91-8D0C52E68AC8}"
267-
ProjectSection(SolutionItems) = preProject
268-
Installers\Ubuntu\build_installer.sh = Installers\Ubuntu\build_installer.sh
269-
EndProjectSection
270-
EndProject
271-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "templates", "templates", "{88812453-FC59-48D4-8B8A-890DA33EA039}"
272-
ProjectSection(SolutionItems) = preProject
273-
Installers\Ubuntu\templates\systemd.service = Installers\Ubuntu\templates\systemd.service
274-
EndProjectSection
275-
EndProject
276-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DEBIAN", "DEBIAN", "{5D495EED-F89D-4EF8-9678-7F75F78617A9}"
277-
ProjectSection(SolutionItems) = preProject
278-
Installers\Ubuntu\templates\Resources\banner.png = Installers\Ubuntu\templates\Resources\banner.png
279-
Installers\Ubuntu\templates\Resources\LICENSE.txt = Installers\Ubuntu\templates\Resources\LICENSE.txt
280-
Installers\Ubuntu\templates\Resources\uninstall.sh = Installers\Ubuntu\templates\Resources\uninstall.sh
281-
EndProjectSection
282-
EndProject
283-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{35A70F3E-EE70-48D9-A86D-3434AEF4CAE2}"
284-
ProjectSection(SolutionItems) = preProject
285-
Installers\Ubuntu\templates\DEBIAN\control = Installers\Ubuntu\templates\DEBIAN\control
286-
Installers\Ubuntu\templates\DEBIAN\postinst = Installers\Ubuntu\templates\DEBIAN\postinst
287-
Installers\Ubuntu\templates\DEBIAN\prerm = Installers\Ubuntu\templates\DEBIAN\prerm
288-
EndProjectSection
289-
EndProject
290213
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{2A2CB97D-0086-4891-AFA1-198F414E3562}"
291214
ProjectSection(SolutionItems) = preProject
292215
docker\docker-compose-cuda-11.7.yml = docker\docker-compose-cuda-11.7.yml
@@ -312,13 +235,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{
312235
src\SDK\Utilities\stop_all.sh = src\SDK\Utilities\stop_all.sh
313236
EndProjectSection
314237
EndProject
315-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Articles", "Articles", "{AB05F086-BBA9-4E10-9D96-A92814584539}"
316-
EndProject
317-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mesh", "Mesh", "{328FF294-5E4F-4A0E-AEA2-CCE114D662AC}"
318-
ProjectSection(SolutionItems) = preProject
319-
Using a Mesh of CodeProject.AI Servers to Optimize Performance.md = Using a Mesh of CodeProject.AI Servers to Optimize Performance.md
320-
EndProjectSection
321-
EndProject
322238
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ParseJSON", "src\SDK\Utilities\ParseJSON\ParseJSON.csproj", "{AF84AA51-8718-40EC-B5D7-281799A7B07C}"
323239
EndProject
324240
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "Llama", "src\modules\LlamaChat\Llama.pyproj", "{D56CA115-830A-4007-BB9B-BF0FC72DA9B0}"
@@ -555,8 +471,6 @@ Global
555471
{C33D90E7-7570-46FB-9EB9-ED6B40A93A9B} = {1912618E-7942-4BB0-BC2B-7F48A38D1049}
556472
{CB26AB5B-DB85-4A59-A3AE-FA55A35D05B0} = {3A860CDD-94B9-4002-BA08-87E8822DDE50}
557473
{FF0C329F-41E8-4540-BCDB-97690911077D} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
558-
{83C828B9-2B1E-4982-B4B7-69D173DFBB27} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
559-
{FB0561D3-4AF8-415A-85B4-E4E9ADDC3DB2} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
560474
{D320EA6C-2388-41F7-A4D1-980192665A61} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
561475
{C5CC1B6F-14B1-41C1-A2F3-164B37BDCC0C} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
562476
{49530738-22E7-4D2C-88FD-B20B68BF3A75} = {B10B59B5-9F63-41C2-BFBB-6C7311DC4E99}
@@ -568,7 +482,6 @@ Global
568482
{25750BF1-1502-4F65-8D69-CEA8C87D6446} = {37533562-EC4C-4FB4-8C42-FE327D1D79BD}
569483
{C2500118-FD99-49EF-B726-3E2A3B30A717} = {37533562-EC4C-4FB4-8C42-FE327D1D79BD}
570484
{1C7E0F81-1F4A-478B-80CE-4C41606DC087} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
571-
{31DA8C15-C038-4667-89AB-74FED47D7B51} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
572485
{6AE28B59-221B-4E3D-A66C-E255B26DAC82} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
573486
{F7056ECA-1C9C-4544-99CA-731C944651D6} = {FF0C329F-41E8-4540-BCDB-97690911077D}
574487
{0690D5F7-864F-4347-8E20-FA9903CE56EB} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
@@ -588,17 +501,9 @@ Global
588501
{A472B309-3C77-4DE5-8F03-AA81938EEFB4} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
589502
{470D3417-36A4-49A4-B719-496466FA92FB} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
590503
{2DFDA382-189B-45D1-94D5-3004D1AEB73C} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
591-
{1D776E6C-8123-4EF7-9AB1-81BE0B1FB4C1} = {83C828B9-2B1E-4982-B4B7-69D173DFBB27}
592-
{5FC5036D-2546-4A5E-B0B3-C3275E695176} = {1D776E6C-8123-4EF7-9AB1-81BE0B1FB4C1}
593504
{BFB8AD18-8C6E-4B25-B4AA-1AAB90ADA843} = {A8B76501-496A-4011-9C37-8308A1EBDFA7}
594-
{703A2403-15BC-477D-89F5-F1325F85A03D} = {1D776E6C-8123-4EF7-9AB1-81BE0B1FB4C1}
595-
{48A09F35-2977-4D23-AF91-8D0C52E68AC8} = {D885EE64-C1BD-44D6-84D8-1E46806298D9}
596-
{88812453-FC59-48D4-8B8A-890DA33EA039} = {48A09F35-2977-4D23-AF91-8D0C52E68AC8}
597-
{5D495EED-F89D-4EF8-9678-7F75F78617A9} = {88812453-FC59-48D4-8B8A-890DA33EA039}
598-
{35A70F3E-EE70-48D9-A86D-3434AEF4CAE2} = {88812453-FC59-48D4-8B8A-890DA33EA039}
599505
{6AE28B59-221B-4E3D-A66C-E255B26DAF82} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
600506
{A04CA21C-39DF-4466-B48B-A08AA0A262BD} = {FF0C329F-41E8-4540-BCDB-97690911077D}
601-
{328FF294-5E4F-4A0E-AEA2-CCE114D662AC} = {AB05F086-BBA9-4E10-9D96-A92814584539}
602507
{AF84AA51-8718-40EC-B5D7-281799A7B07C} = {A04CA21C-39DF-4466-B48B-A08AA0A262BD}
603508
{D56CA115-830A-4007-BB9B-BF0FC72DA9B0} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}
604509
{470D3417-36A4-49A4-B719-486477FA92FB} = {1C7E0F81-1F4A-478B-80CE-4C41606DC087}

‎src/SDK/NET/API/ApiClient.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public async Task<ServerResponse> GetAsync(string route)
145145
}
146146
catch (Exception ex)
147147
{
148-
response = new ServerErrorResponse(ex.Message);
148+
response = new ServerErrorResponse("GetAsync error: " + ex.Message);
149149
}
150150

151151
return response;
@@ -178,7 +178,7 @@ public async Task<ServerResponse> GetAsync<T>(string route)
178178
}
179179
catch (Exception ex)
180180
{
181-
response = new ServerErrorResponse(ex.Message);
181+
response = new ServerErrorResponse("GetAsync<T> error: " + ex.Message);
182182
}
183183

184184
return response;
@@ -212,7 +212,7 @@ public async Task<ServerResponse> PostAsync<T>(string route, ServerRequestConten
212212
}
213213
catch (Exception ex)
214214
{
215-
response = new ServerErrorResponse(ex.Message);
215+
response = new ServerErrorResponse("PostAsync error: " + ex.Message);
216216
}
217217

218218
return response;

‎src/SDK/NET/API/ExplorerUI.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,44 @@
22

33
namespace CodeProject.AI.SDK.API
44
{
5+
/// <summary>
6+
/// Represents an option in a dropdown menu in the dashboard
7+
/// </summary>
8+
public class DashboardMenuOption
9+
{
10+
/// <summary>
11+
/// Gets or sets the label for this menu option
12+
/// </summary>
13+
public string? Label { get; set; }
14+
15+
/// <summary>
16+
/// Gets or sets the setting to be modified by this menu option
17+
/// </summary>
18+
public string? Setting { get; set; }
19+
20+
/// <summary>
21+
/// Gets or sets the value to be set by this menu option
22+
/// </summary>
23+
public string? Value { get; set; }
24+
}
25+
26+
/// <summary>
27+
/// Represents a dropdown menu in the dashboard. This will be used to construct a dropdown menu
28+
/// in the CodeProject.AI Server dashboard for the given module.
29+
/// </summary>
30+
public class DashboardMenu
31+
{
32+
/// <summary>
33+
/// Gets or sets the label for this menu
34+
/// </summary>
35+
public string? Label { get; set; }
36+
37+
/// <summary>
38+
/// Gets or sets the options for this menu
39+
/// </summary>
40+
public DashboardMenuOption[]? Options { get; set; }
41+
}
42+
543
/// <summary>
644
/// A structure containing the HTML, CSS and Javascript that are to be injected into the
745
/// Explorer web app to allow the user to explore and test a module.

‎src/SDK/NET/API/ModuleResponses.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ public class ModuleResponse : BaseResponse
4848
/// response.
4949
/// </summary>
5050
public long AnalysisRoundTripMs { get; set; }
51+
52+
/// <summary>
53+
/// Gets or set a dictionary representing the current module status
54+
/// </summary>
55+
public object? StatusData { get; set; }
5156
}
5257

5358
/// <summary>

‎src/SDK/NET/API/VersionInfo.cs‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class VersionInfo
3030
/// <summary>
3131
/// Gets or sets a value indicating whether this version contains a security update
3232
/// </summary>
33-
public bool? SecurityUpdate { get; set; }
33+
public bool SecurityUpdate { get; set; }
3434

3535
/// <summary>
3636
/// Gets or sets the build number
@@ -155,11 +155,19 @@ public static int Compare(VersionInfo versionA, VersionInfo versionB)
155155
if (versionA.Build != versionB.Build)
156156
return versionA.Build - versionB.Build;
157157

158-
// int result = (versionA.PreRelease ?? "").CompareTo(versionB.PreRelease ?? "");
159-
// if (result != 0)
160-
// return result;
158+
// A pre-release string will be greater than an empty string. We actually want the
159+
// opposite. 2.5.0 > 2.5.0-RC1 and 2.5.0-RTM > 2.5.0-RC1
161160

162-
return (versionA.SecurityUpdate ?? false).CompareTo(versionB.SecurityUpdate ?? false);
161+
if (string.IsNullOrWhiteSpace(versionA.PreRelease) && !string.IsNullOrWhiteSpace(versionB.PreRelease))
162+
return 1;
163+
164+
if (!string.IsNullOrWhiteSpace(versionA.PreRelease) && string.IsNullOrWhiteSpace(versionB.PreRelease))
165+
return -1;
166+
167+
if (!(versionA.PreRelease ?? string.Empty).Equals(versionB.PreRelease ?? string.Empty))
168+
return (versionA.PreRelease ?? string.Empty).CompareTo(versionB.PreRelease ?? string.Empty);
169+
170+
return versionA.SecurityUpdate.CompareTo(versionB.SecurityUpdate);
163171
}
164172
}
165173
}

‎src/SDK/NET/Analysis/BackendClient.cs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public BackendClient(string url, TimeSpan timeout = default, CancellationToken t
3434
_httpClient ??= new HttpClient
3535
{
3636
BaseAddress = new Uri(url),
37-
Timeout = (timeout == default) ? TimeSpan.FromMinutes(1) : timeout
37+
Timeout = (timeout == default) ? TimeSpan.FromMinutes(1) : timeout
3838
};
3939

4040
loggingTask = ProcessLoggingQueue(token);
@@ -77,33 +77,27 @@ public BackendClient(string url, TimeSpan timeout = default, CancellationToken t
7777
BackendRequest? request = null;
7878
try
7979
{
80-
//request = await _httpClient!.GetFromJsonAsync<BackendRequest>(requestUri, token)
81-
// .ConfigureAwait(false);
82-
var response = await _httpClient!.GetAsync(requestUri, token);
83-
// only process responses that have content
80+
HttpResponseMessage response = await _httpClient!.GetAsync(requestUri, token);
8481
if (response.StatusCode == System.Net.HttpStatusCode.OK)
85-
{
8682
request = await response.Content.ReadFromJsonAsync<BackendRequest>();
87-
}
88-
else
89-
{
90-
return null;
91-
}
9283
}
9384
catch (JsonException)
9485
{
86+
#if DEBUG
87+
Debug.WriteLine("JsonException GetRequest");
88+
#endif
9589
// This is probably due to timing out and therefore no JSON to parse.
9690
}
9791
#if DEBUG
9892
catch (Exception ex)
9993
{
100-
Debug.WriteLine(ex);
94+
Debug.WriteLine("Error in GetRequest: " + ex.Message);
10195
#else
10296
catch (Exception /*ex*/)
10397
{
10498
#endif
10599
Console.WriteLine($"Unable to get request from {queueName} for {moduleId}");
106-
_errorPauseSecs = Math.Min(_errorPauseSecs > 0 ? _errorPauseSecs * 2 : 5, 60);
100+
_errorPauseSecs = Math.Min(_errorPauseSecs > 0 ? _errorPauseSecs * 3/2 : 5, 30);
107101

108102
if (!token.IsCancellationRequested && _errorPauseSecs > 0)
109103
{
@@ -199,7 +193,7 @@ private async Task ProcessLoggingQueue(CancellationToken token = default)
199193
}
200194
catch(Exception e)
201195
{
202-
Debug.Write(e);
196+
Debug.Write("Error processing logging queue: " + e.Message);
203197
}
204198
}
205199
}

‎src/SDK/NET/Analysis/BackendRequests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void AddFile(string filePath)
216216
}
217217
catch (Exception e)
218218
{
219-
Debug.WriteLine(e);
219+
Debug.WriteLine("Error adding file: " + e.Message);
220220
}
221221
}
222222

0 commit comments

Comments
 (0)