Strongly type connection status

LLama.Web/Models/LLamaOptions.cs → LLama.Web/Common/LLamaOptions.cs

@@ -1,4 +1,4 @@
-namespace LLama.Web.Models
+namespace LLama.Web.Common
 {
     public class LLamaOptions
     {

LLama.Web/Models/ModelOptions.cs → LLama.Web/Common/ModelOptions.cs

@@ -1,6 +1,6 @@
 using LLama.Common;
 
-namespace LLama.Web.Models
+namespace LLama.Web.Common
 {
     public class ModelOptions : ModelParams
     {

LLama.Web/Models/ParameterOptions.cs → LLama.Web/Common/ParameterOptions.cs

@@ -1,6 +1,6 @@
 using LLama.Common;
 
-namespace LLama.Web.Models
+namespace LLama.Web.Common
 {
     public class ParameterOptions : InferenceParams
     {

LLama.Web/Models/PromptOptions.cs → LLama.Web/Common/PromptOptions.cs

@@ -1,4 +1,4 @@
-namespace LLama.Web.Models
+namespace LLama.Web.Common
 {
     public class PromptOptions
     {

LLama.Web/Common/SessionConnectionStatus.cs

@@ -0,0 +1,9 @@
+namespace LLama.Web.Common
+{
+    public enum SessionConnectionStatus
+    {
+        Disconnected = 0,
+        Loaded = 4,
+        Connected = 10
+    }
+}

LLama.Web/Hubs/ISessionClient.cs

@@ -1,10 +1,11 @@
-using LLama.Web.Models;
+using LLama.Web.Common;
+using LLama.Web.Models;
 
 namespace LLama.Web.Hubs
 {
     public interface ISessionClient
     {
-        Task OnStatus(string status, string data = null);
+        Task OnStatus(string connectionId, SessionConnectionStatus status);
         Task OnResponse(ResponseFragment fragment);
         Task OnError(string error);
     }

LLama.Web/Hubs/InteractiveHub.cs

@@ -1,4 +1,5 @@
-using LLama.Web.Models;
+using LLama.Web.Common;
+using LLama.Web.Models;
 using LLama.Web.Services;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Options;
@@ -24,7 +25,7 @@ namespace LLama.Web.Hubs
         {
             _logger.Log(LogLevel.Information, "OnConnectedAsync, Id: {0}", Context.ConnectionId);
             await base.OnConnectedAsync();
-            await Clients.Caller.OnStatus("Connected", Context.ConnectionId);
+            await Clients.Caller.OnStatus(Context.ConnectionId, SessionConnectionStatus.Connected);
         }
 
 
@@ -55,7 +56,7 @@ namespace LLama.Web.Hubs
                 
             }
             _logger.Log(LogLevel.Information, "[OnLoadModel] - New model session added, Connection: {0}", Context.ConnectionId);
-            await Clients.Caller.OnStatus("Loaded", Context.ConnectionId);
+            await Clients.Caller.OnStatus(Context.ConnectionId, SessionConnectionStatus.Loaded);
         }
 
 

LLama.Web/Models/ModelSession.cs

@@ -1,4 +1,5 @@
 using LLama.Abstractions;
+using LLama.Web.Common;
 
 namespace LLama.Web.Models
 {

LLama.Web/Pages/Interactive.cshtml

@@ -172,12 +172,12 @@
         const chatInput = $("#input");
 
 
-        const onStatus = (status, data) => {
-            if (status == "Connected") {
+        const onStatus = (connectionId, status) => {
+            connectionId = connectionId;
+            if (status == Enums.SessionConnectionStatus.Connected) {
                 $("#socket").text("Connected").addClass("text-success");
-                connectionId = data;
             }
-            else if (status == "Loaded") {
+            else if (status == Enums.SessionConnectionStatus.Loaded) {
                 enableControls();
                 $("#session-details").html(Mustache.render(sessionDetailsTemplate, { model: getSelectedModel(), prompt: getSelectedPrompt(), parameter: getSelectedParameter() }));
                 onInfo(`New model session successfully started`)

LLama.Web/Pages/Interactive.cshtml.cs

@@ -1,4 +1,5 @@
-using LLama.Web.Models;
+using LLama.Web.Common;
+using LLama.Web.Models;
 using LLama.Web.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;

LLama.Web/Program.cs

@@ -1,5 +1,5 @@
+using LLama.Web.Common;
 using LLama.Web.Hubs;
-using LLama.Web.Models;
 using LLama.Web.Services;
 
 namespace LLama.Web

LLama.Web/Services/IModelSessionService.cs

@@ -1,4 +1,5 @@
 using LLama.Abstractions;
+using LLama.Web.Common;
 using LLama.Web.Models;
 
 namespace LLama.Web.Services

LLama.Web/Services/ModelSessionService.cs

@@ -1,4 +1,5 @@
 using LLama.Abstractions;
+using LLama.Web.Common;
 using LLama.Web.Models;
 using System.Collections.Concurrent;
 

LLama.Web/wwwroot/js/site.js

@@ -29,4 +29,23 @@ const ajaxGetJsonAsync = (url, data) => {
 		dataType: 'json',
 		data: data
 	});
-}
+}
+
+
+
+
+const Enums = {
+	SessionConnectionStatus: Object.freeze({
+		Disconnected: 0,
+		Loaded: 4,
+		Connected: 10
+	}),
+
+	GetName: (enumType, enumKey) => {
+		return Object.keys(enumType)[enumKey]
+	},
+
+	GetValue: (enumType, enumName) => {
+		return enumType[enumName];
+	}
+};