= comfiuinodes function '/run' endpoint seems to be working

Author: rasberry

Cli/Options.cs

@@ -56,6 +56,7 @@ public void Usage(StringBuilder sb, IRegister _)
 		sb.ND(1, "-lf / --formats", "List engine supported image formats");
 		sb.ND(1, "-ln / --namespace (name)", "List registered items in given namespace (specify 'all' to list everything)");
 		sb.ND(1, "--", "Pass all remaining options to the function");
+		// sb.ND(1, "-n / --name (name)", "Name of the function to run"); //Note: reserving this in-case it must be a named input
 	}
 
 	public bool ParseArgs(string[] args, IRegister _)

Cli/Program.cs

@@ -1,4 +1,5 @@
 using ImageFunctions.Core;
+using ImageFunctions.Core.FileIO;
 using ImageFunctions.Core.Logging;
 using System.Diagnostics;
 
@@ -20,8 +21,7 @@ static int Main(string[] args)
 			using var register = new CoreRegister(log);
 			var options = new Options(register, log);
 			using var layers = new Layers();
-			using var clerk = new FileClerk();
-			var main = new Program(register, options, layers, clerk, log);
+			var main = new Program(register, options, layers, log);
 			return main.Run(args);
 		}
 		catch(Exception e) {
@@ -35,12 +35,11 @@ static int Main(string[] args)
 		}
 	}
 
-	internal Program(IRegister register, Options options, ILayers layers, IFileClerk clerk, ICoreLog log)
+	internal Program(IRegister register, Options options, ILayers layers, ICoreLog log)
 	{
 		Register = register;
 		Options = options;
 		Layers = layers;
-		Clerk = clerk;
 		Log = log;
 	}
 
@@ -63,9 +62,9 @@ int Run(string[] args)
 
 		//save the layers to one or more images
 		Log.Info($"Saving image {Options.OutputName}");
-		Clerk.Location = Options.OutputName;
+		using var clerk = new FileClerk(FileIO, Options.OutputName);
 		if(Layers.Count > 0) {
-			Options.Engine.Item.Value.SaveImage(Layers, Clerk, Options.ImageFormat);
+			Options.Engine.Item.Value.SaveImage(Layers, clerk, Options.ImageFormat);
 		}
 		else {
 			Log.Warning(Note.NoLayersToSave());
@@ -130,21 +129,21 @@ bool LoadImages()
 		//we're reversing the images since we're using a stack
 		// so the first image specified should stay on top
 		// and the last one on the bottom.
-		foreach(var i in Options.ImageFileNames.Reverse()) {
-			if(!File.Exists(i)) {
-				Log.Error(Note.CannotFindInputImage(i));
+		foreach(var file in Options.ImageFileNames.Reverse()) {
+			using var clerk = new FileClerk(FileIO, file);
+			if(!File.Exists(file)) {
+				Log.Error(Note.CannotFindInputImage(file));
 				return false;
 			}
-			Clerk.Location = i;
-			Options.Engine.Item.Value.LoadImage(Layers, Clerk);
+			Options.Engine.Item.Value.LoadImage(Layers, clerk);
 		}
 
 		return true;
 	}
 
-	readonly IFileClerk Clerk;
 	internal ILayers Layers;
 	internal IRegister Register;
 	internal Options Options; //not using ICoreOptions interface to allow access to extra methods
 	internal ICoreLog Log;
+	readonly SimpleFileIO FileIO = new();
 }

ComfiUINodes/Handlers/FunctionInfo.cs

@@ -10,6 +10,7 @@ namespace ImageFunctions.ComfiUINodes;
 
 internal static partial class Handlers
 {
+	[HttpRoute("/info")]
 	public static void FunctionInfo(HttpListenerContext ctx)
 	{
 		if(!ctx.EnsureMethodIs(HttpMethod.Get)) { return; }
@@ -51,27 +52,26 @@ public static void FunctionInfo(HttpListenerContext ctx)
 			}
 		}
 
-		var json = JsonSerializer.Serialize(data, data.GetType(), options: JOptions);
-		resp.WriteText(json);
+		resp.WriteJson(data, JOptions);
 	}
 
 	static readonly JsonSerializerOptions JOptions = new() {
 		IncludeFields = true,
 	};
 
-	static string GetParamDescription(IUsageProvider provider)
-	{
-		var usage = provider.GetUsageInfo();
-		var ud = usage.Description;
-
-		StringBuilder description = new();
-		if((ud?.Descriptions?.Any()).GetValueOrDefault(false)) {
-			foreach(var txt in usage.Description.Descriptions) {
-				description.AppendLine(txt);
-			}
-		}
-		return description.ToString();
-	}
+	// static string GetParamDescription(IUsageProvider provider)
+	// {
+	// 	var usage = provider.GetUsageInfo();
+	// 	var ud = usage.Description;
+
+	// 	StringBuilder description = new();
+	// 	if((ud?.Descriptions?.Any()).GetValueOrDefault(false)) {
+	// 		foreach(var txt in usage.Description.Descriptions) {
+	// 			description.AppendLine(txt);
+	// 		}
+	// 	}
+	// 	return description.ToString();
+	// }
 
 	static UsageParam DetermineParamList(Usage usage, IUsageParameter iup)
 	{

ComfiUINodes/Handlers/HandleNotFound.cs

@@ -6,11 +6,9 @@ internal static partial class Handlers
 {
 	public static void HandleNotFound(HttpListenerContext ctx)
 	{
-		using HttpListenerResponse resp = ctx.Response;
-		resp.ContentType = "text/plain";
+		using var resp = ctx.Response;
 		resp.StatusCode = (int)HttpStatusCode.NotFound;
-
 		string err = $"404 - Not Found '{ctx.Request.Url?.LocalPath}'";
-		resp.WriteText(err);
+		resp.WritePlainText(err);
 	}
 }

ComfiUINodes/Handlers/Help.cs

@@ -0,0 +1,15 @@
+using System.Net;
+
+namespace ImageFunctions.ComfiUINodes;
+
+internal static partial class Handlers
+{
+	[HttpRoute("/help")]
+	public static void Help(HttpListenerContext ctx)
+	{
+		if(!ctx.EnsureMethodIs(HttpMethod.Get)) { return; }
+
+		var list = Program.Server.RoutesList();
+		ctx.Response.WriteJson(new { routes = list });
+	}
+}

ComfiUINodes/Handlers/JobResult.cs

@@ -0,0 +1,60 @@
+using ImageFunctions.Core.FileIO;
+using System.Net;
+using System.Net.Http.Headers;
+
+namespace ImageFunctions.ComfiUINodes;
+
+internal static partial class Handlers
+{
+	[HttpRoute("/result")]
+	public static void JobResult(HttpListenerContext ctx)
+	{
+		if(!ctx.EnsureMethodIs(HttpMethod.Get)) { return; }
+		using var resp = ctx.Response;
+		var req = ctx.Request;
+
+		var sjob = req.QueryString.Get("job");
+		if(!TryFindJob(req, resp, sjob, out var job, out var jobId)) {
+			return;
+		}
+
+		if(job.Status == JobStatusKind.Failed) {
+			ErrorResponse(resp, HttpStatusCode.OK, (LoggerForJob)job.Context.Log);
+			JobHoard.Remove(jobId, out _);
+			return;
+		}
+		else if(job.Status != JobStatusKind.Finished) {
+			resp.WritePlainText($"102 - Job '{jobId}' continues to be processed");
+			return;
+		}
+
+		//job.Context.Options.
+
+		//extract the binary images from layers
+		var clerk = new RelayClerk("result");
+		List<NamedMemory> binList = new();
+		clerk.AqureWrite += (o, e) => {
+			var nm = new NamedMemory {
+				Memory = new MemoryStream(),
+				Name = clerk.GetLabel(e.Name,e.Extension,e.Tag)
+			};
+			binList.Add(nm);
+			e.Source = nm.Memory;
+		};
+		var eng = job.Context.Options.Engine.Item.Value;
+		eng.SaveImage(job.Context.Layers, clerk);
+
+		var data = new MultipartContent();
+		foreach(var nm in binList) {
+			var content = new ByteArrayContent(nm.Memory.ToArray());
+			var contentDisp = new ContentDispositionHeaderValue("form-data") { Name = nm.Name };
+			content.Headers.ContentDisposition = contentDisp;
+			data.Add(content);
+		}
+
+		//write bins back to to http stream
+		resp.ContentType = "multipart/form-data";
+		var canSource = new CancellationTokenSource(TimeSpan.FromMinutes(60));
+		data.CopyTo(resp.OutputStream, null, canSource.Token);
+	}
+}