update

Author: mythz

MyApp.ServiceInterface/AppConfig.cs

@@ -26,6 +26,7 @@ public class AppConfig
 
     public string? GoogleClientId { get; set; }
     public string? GoogleClientSecret { get; set; }
+    public string? BunExePath { get; set; }
 
     public VueAppConfig ToVueAppConfig() => new() {
         AppName = AppName,

MyApp.ServiceInterface/AppData.cs

@@ -97,6 +97,11 @@ public async Task<string> SaveUploadedArtifactAsync(IHttpFile uploadedFile)
     public Stream OpenArtifactStream(string fileName) => File.OpenRead(GetArtifactPath(fileName));
     public string GetArtifactPath(string fileName) => appConfig.ArtifactsPath.CombineWith(fileName[..2], fileName);
 
+    public string GetDeviceObjectInfoPath(string deviceId) => 
+        GetDevicePath(deviceId).CombineWith("object_info.json");
+    public string GetDevicePath(string deviceId) => 
+        appConfig.ArtifactsPath.CombineWith(deviceId.GetDevicePath());
+    
     ServerEvent RegisterEvent = new() { Event = "register" };
     ServerEvent HeartbeatEvent = new() { Event = "heartbeat", Data = "pulse" };
 
@@ -147,11 +152,16 @@ public void Reload(IDbConnection db)
     }
 
     public string OverridesPath => Path.GetFullPath(Path.Combine(appConfig.AppDataPath, "/overrides"));
+
+    public string DefaultObjectInfoPath { get; set; }
 
     public void LoadDefaultObjectInfo()
     {
-        var json = ReadTextFile(Path.Combine(OverridesPath, "object_info.gateway.json"))
-            ?? ReadTextFile("wwwroot/data/object_info.gateway.json")
+        DefaultObjectInfoPath = Path.Combine(OverridesPath, "object_info.gateway.json");
+        if (!File.Exists(DefaultObjectInfoPath))
+            DefaultObjectInfoPath = WebRootPath.CombineWith("data/object_info.gateway.json");
+                
+        var json = ReadTextFile(DefaultObjectInfoPath)
             ?? throw new Exception("object_info.gateway.json not found");
         Metadata.LoadObjectInfo(json);
         DefaultGatewayNodes = Metadata.DefaultNodeDefinitions.Keys.ToSet();
@@ -253,17 +263,18 @@ void AddModel(Asset model)
         ? null 
         : Workflows.FirstOrDefault(x => x.Id == workflowId);
 
-    public ParsedWorkflow ParseWorkflow(string workflowJson, string workflowName, string baseModel) =>
-        _ParseWorkflow(workflowJson, workflowName, baseModel, rethrow: true)!;
+    public ParsedWorkflow ParseWorkflow(string workflowJson, string workflowName, string baseModel, string version) =>
+        _ParseWorkflow(workflowJson, workflowName, baseModel, version, rethrow: true)!;
 
-    public ParsedWorkflow? TryParseWorkflow(string workflowJson, string workflowName, string baseModel) =>
-        _ParseWorkflow(workflowJson, workflowName, baseModel, rethrow: false);
+    public ParsedWorkflow? TryParseWorkflow(string workflowJson, string workflowName, string baseModel, string version) =>
+        _ParseWorkflow(workflowJson, workflowName, baseModel, version, rethrow: false);
 
-    public ParsedWorkflow? _ParseWorkflow(string workflowJson, string workflowName, string baseModel, bool rethrow)
+    public ParsedWorkflow? _ParseWorkflow(string workflowJson, string workflowName, string baseModel, string version, bool rethrow)
     {
         var ret = new ParsedWorkflow
         {
-            BaseModel = baseModel
+            BaseModel = baseModel,
+            Version = version,
         };
         try
         {
@@ -314,7 +325,7 @@ public void LoadWorkflows(IDbConnection db)
     {
         var workflows = db.Select<Workflow>();
         var workflowVersions = db.Select<WorkflowVersion>();
-        var workflowPaths = workflows.ToDictionary(x => x.Path);
+        var workflowPaths = workflowVersions.ToDictionary(x => x.Path);
 
         var files = Directory.GetFiles(WorkflowsPath, "*.json", SearchOption.AllDirectories);
         var allWorkflows = files.Map(x => x[WorkflowsPath.Length..].TrimStart('/'));
@@ -327,25 +338,35 @@ public void LoadWorkflows(IDbConnection db)
             var parts = workflowPath.Split('/');
             if (parts.Length != 3)
             {
-                log.LogWarning("Invalid Workflow Path: {WorkflowPath}, should be <category>/<group>/<filename>.json", workflowPath);
+                log.LogWarning("Invalid Workflow Path: {WorkflowPath}, should be <category>/<group>/<name>.<version>.json", workflowPath);
                 continue;
             }
+
+            var fileName = workflowPath.LastRightPart('/');
+            var nameAndVersion = fileName.WithoutExtension();
+            if (nameAndVersion.IndexOf('.') == -1)
+            {
+                log.LogWarning("Invalid Workflow Filename: {FileName}, should be <name>.<version>.json", fileName);
+                continue;
+            }
+
+            var name = nameAndVersion.LastLeftPart('.');
+            var version = nameAndVersion.LastRightPart('.');
 
             var userId = AppConfig.Instance.DefaultUserId;
             var workflowJson = ReadTextFile(WorkflowsPath.CombineWith(workflowPath))
-                               ?? throw new Exception($"Workflow not found: {workflowPath}");
+                ?? throw new Exception($"Workflow not found: {workflowPath}");
 
-            var name = parts[2].WithoutExtension();
             var baseModel = parts[1];
-            var workflowName = StringFormatters.FormatName(workflowPath.LastRightPart('/').WithoutExtension());
-            var parsedWorkflow = TryParseWorkflow(workflowJson, workflowName, baseModel);
+            var workflowName = StringFormatters.FormatName(name);
+            var parsedWorkflow = TryParseWorkflow(workflowJson, workflowName, baseModel, version);
             if (parsedWorkflow == null)
                 continue;
 
             var (workflow, workflowVersion) = CreateWorkflowAndVersion(db, parsedWorkflow, userId);
 
             workflowVersions.Add(workflowVersion);
-            workflowPaths[workflow.Path] = workflow;
+            workflowPaths[workflowVersion.Path] = workflowVersion;
             workflows.Add(workflow);
         }
         Workflows = workflows;
@@ -355,7 +376,6 @@ public static (Workflow,WorkflowVersion) CreateWorkflowAndVersion(IDbConnection
     {
         var workflow = new Workflow
         {
-            Path = parsedWorkflow.Path,
             Name = parsedWorkflow.Name,
             Category = parsedWorkflow.Category,
             Base = parsedWorkflow.BaseModel,
@@ -370,8 +390,9 @@ public static (Workflow,WorkflowVersion) CreateWorkflowAndVersion(IDbConnection
         var workflowVersion = new WorkflowVersion
         {
             ParentId = workflow.Id,
-            Version = "v1",
             Name = parsedWorkflow.Name,
+            Version = parsedWorkflow.Version,
+            Path = parsedWorkflow.Path,
             Workflow = parsedWorkflow.Workflow,
             Info = parsedWorkflow.Info,
             Nodes = parsedWorkflow.Nodes,
@@ -889,6 +910,16 @@ public bool AgentCanRunWorkflow(ComfyAgent agent, HashSet<string> RequiredNodes,
         return true;
     }
 
+    public ComfyAgent? GetSupportedAgent(HashSet<string> requiredNodes, HashSet<string> requiredAssets)
+    {
+        foreach (var agent in ComfyAgents.Values)
+        {
+            if (AgentCanRunWorkflow(agent, requiredNodes, requiredAssets))
+                return agent;
+        }
+        return null;
+    }
+
     public Dictionary<string, NodeInfo> GetSupportedNodeDefinitions(HashSet<string> requiredNodes, HashSet<string> requiredAssets)
     {
         foreach (var agent in ComfyAgents.Values)

MyApp.ServiceInterface/ComfyProvider.cs

@@ -19,7 +19,8 @@ public class ComfyServices(ILogger<ComfyServices> log,
     ComfyGateway comfyGateway,
     IBackgroundJobs jobs, 
     IDbConnectionFactory dbFactory,
-    AgentEventsManager agentManager)
+    AgentEventsManager agentManager,
+    IComfyWorkflowConverter comfyConverter)
     : Service
 {
     public const string ComfyBaseUrl = "http://localhost:7860/api";
@@ -313,7 +314,7 @@ public async Task<WorkflowInfo> GetWorkflowInfoAsync(string path)
     //     return apiPrompt;
     // }
 
-    public object Post(RequeueGeneration request)
+    public async Task<object> Post(RequeueGeneration request)
     {
         var userId = Request.GetClaimsPrincipal().GetUserId();
         log.LogInformation("Received RequeueGeneration from '{UserId}' to execute Generation '{Id}'",
@@ -339,21 +340,13 @@ public object Post(RequeueGeneration request)
             }
 
             var workflowVersion = GetWorkflowVersion(Db, gen.WorkflowId, gen.VersionId);
-            var workflow = workflowVersion.Workflow;
-            var workflowInfo = workflowVersion.Info;
-            var result = ComfyWorkflowParser.MergeWorkflow(workflow, gen.Args!, workflowInfo);
-            gen.Workflow = result.Result;
-
-            var requiredNodes = ComfyWorkflowParser.ExtractNodeTypes(workflow, log);
-            var requiredAssets = ComfyWorkflowParser.ExtractAssetPaths(workflow, log);
-            var nodeDefs = appData.GetSupportedNodeDefinitions(requiredNodes, requiredAssets);
-            gen.ApiPrompt = ComfyConverters.ConvertWorkflowToApiPrompt(workflow, nodeDefs, gen.Id, log:log);
+            var (apiPrompt, newWorkflow) = await comfyConverter.CreateApiPromptAsync(workflowVersion, gen.Args, gen.Id);
 
             Db.UpdateOnly(() => new WorkflowGeneration
             {
                 Args = gen.Args,
-                Workflow = gen.Workflow,
-                ApiPrompt = gen.ApiPrompt,
+                Workflow = newWorkflow,
+                ApiPrompt = apiPrompt,
                 DeviceId = null,
                 PromptId = null,
                 Error = null,
@@ -403,32 +396,23 @@ private static WorkflowVersion GetWorkflowVersion(IDbConnection db, int workflow
         return workflowVersion;
     }
 
-    public object Post(QueueWorkflow request)
+    public async Task<object> Post(QueueWorkflow request)
     {
         using var db = Db;
         var userId = Request.GetClaimsPrincipal().GetUserId();
         log.LogInformation("Received QueueComfyWorkflow from '{UserId}' to execute workflow '{Workflow}'",
             userId, request.WorkflowId);
 
-        var workflowVersion = GetWorkflowVersion(db, request.WorkflowId, request.VersionId);
-        var workflow = workflowVersion.Workflow;
-        var workflowInfo = workflowVersion.Info;
-        if (request.Args?.Count > 0)
-        {
-            var result = ComfyWorkflowParser.MergeWorkflow(workflow, request.Args!, workflowInfo);
-            workflow = result.Result;
-        }
-
-        var requiredNodes = ComfyWorkflowParser.ExtractNodeTypes(workflow, log);
-        var requiredAssets = ComfyWorkflowParser.ExtractAssetPaths(workflow, log);
-        var nodeDefs = appData.GetSupportedNodeDefinitions(requiredNodes,requiredAssets);
-        
         var clientId = Guid.NewGuid().ToString("N");
-        var apiPrompt = ComfyConverters.ConvertWorkflowToApiPrompt(workflow, nodeDefs, clientId, log:log);
+        var workflowVersion = GetWorkflowVersion(db, request.WorkflowId, request.VersionId);
+        var (apiPrompt, workflow) = await comfyConverter.CreateApiPromptAsync(workflowVersion, request.Args!, clientId);
 
         log.LogInformation("Queueing ComfyUI Workflow for {ClientId}: {ApiPromptJson}", 
             apiPrompt.ClientId, ClientConfig.ToSystemJson(apiPrompt.Prompt));
 
+        var requiredNodes = ComfyWorkflowParser.ExtractNodeTypes(workflowVersion.Workflow, log);
+        var requiredAssets = ComfyWorkflowParser.ExtractAssetPaths(workflowVersion.Workflow, log);
+        
         var checkpoint = requiredAssets.FirstOrDefault(x => 
             x.StartsWith("checkpoints/") || x.StartsWith("diffusion_models/") || x.StartsWith("unet/") || 
             x.StartsWith("Stable-diffusion/", StringComparison.OrdinalIgnoreCase));
@@ -870,10 +854,10 @@ public async Task<object> Post(UpdateWorkflowVersion request)
         var workflowJson = await Request.Files[0].InputStream.ReadToEndAsync();
         var workflow = db.SingleById<Workflow>(workflowVersion.ParentId);
 
-        var parsedWorkflow = appData.TryParseWorkflow(workflowJson, workflowVersion.Name, workflow.Base)
+        var parsedWorkflow = appData.TryParseWorkflow(workflowJson, workflowVersion.Name, workflow.Base, workflowVersion.Version)
             ?? throw HttpError.BadRequest("Failed to parse workflow");
 
-        var saveToPath = appData.WorkflowsPath.CombineWith(workflow.Path);
+        var saveToPath = appData.WorkflowsPath.CombineWith(workflowVersion.Path);
         Path.GetDirectoryName(saveToPath).AssertDir();
         await File.WriteAllTextAsync(saveToPath, workflowJson);
 
@@ -914,25 +898,28 @@ public async Task<object> Post(ParseWorkflowVersions request)
         foreach (var version in allVersions)
         {
             var workflow = allWorkflows.Find(x => x.Id == version.ParentId);
-            if (workflow?.Path == null)
+            if (workflow == null)
             {
                 ret.Results.Add($"Workflow not found for version {version.Id}");
                 continue;
             }
 
             try
             {
-                var workflowJson = await File.ReadAllTextAsync(appData.WorkflowsPath.CombineWith(workflow.Path));
+                var workflowJson = await File.ReadAllTextAsync(appData.WorkflowsPath.CombineWith(version.Path));
 
-                var parsedWorkflow = appData.ParseWorkflow(workflowJson, version.Name, workflow.Base);
+                var parsedWorkflow = appData.ParseWorkflow(workflowJson, version.Name, workflow.Base, version.Version);
 
-                // if (parsedWorkflow.Nodes.SequenceEqual(version.Nodes) && 
-                //     parsedWorkflow.Assets.SequenceEqual(version.Assets))
-                //     continue;
+                var clientId = version.Workflow.TryGetValue("Id", out var oId) && oId is string id
+                    ? id
+                    : Guid.NewGuid().ToString("N");
+                var (apiPrompt, _) = await comfyConverter.CreateApiPromptAsync(version, new(), clientId);
+                version.ApiPrompt = apiPrompt.Prompt;
 
                 await db.UpdateOnlyAsync(() => new WorkflowVersion {
                     Workflow = parsedWorkflow.Workflow,
                     Info = parsedWorkflow.Info,
+                    ApiPrompt = version.ApiPrompt,
                     Nodes = parsedWorkflow.Nodes,
                     Assets = parsedWorkflow.Assets,
                     ModifiedBy = userId,
@@ -943,7 +930,7 @@ public async Task<object> Post(ParseWorkflowVersions request)
             }
             catch (Exception e)
             {
-                ret.Results.Add($"Failed to parse {workflow.Path}");
+                ret.Results.Add($"Failed to parse {version.Path}");
             }
         }
 
@@ -967,7 +954,7 @@ public async Task<object> Post(ParseWorkflow request)
 
         workflowName = StringFormatters.FormatName(workflowName);
         var workflow = workflowJson.ParseAsObjectDictionary();
-        var parsedWorkflow = appData.TryParseWorkflow(workflowJson, workflowName, "SDXL")
+        var parsedWorkflow = appData.TryParseWorkflow(workflowJson, workflowName, "SDXL", "v1")
             ?? throw HttpError.BadRequest("Failed to parse workflow");
         return parsedWorkflow;
     }
@@ -982,19 +969,25 @@ public async Task<object> Post(UploadNewWorkflow request)
             throw HttpError.BadRequest("No file uploaded");
 
         var name = request.WorkflowName ?? Request.Files[0].FileName.LastRightPart('/').LastLeftPart('.');
-        var fileName = name + ".json";
         // Check for invalid filename chars
-        if (fileName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0 ||
-            fileName.IndexOfAny(Path.GetInvalidPathChars()) >= 0)
+        if (name.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0 ||
+            name.IndexOfAny(Path.GetInvalidPathChars()) >= 0)
             throw HttpError.BadRequest("Invalid Name");
 
+        var version = "v1";
+        if (name.IndexOf('.') >= 0)
+        {
+            version = name.LastRightPart('.');
+            name = name.LastLeftPart('.');
+        }
+        
         if (db.Exists<Workflow>(x => x.Name == name))
             throw new ArgumentNullException(nameof(request.WorkflowName), $"Workflow '{name}' already exists");
 
         var workflowJson = await Request.Files[0].InputStream.ReadToEndAsync();
 
         var baseModel = request.BaseModel.ToJsv(); // Use EnumMember Value if exists
-        var parsedWorkflow = appData.ParseWorkflow(workflowJson, name, baseModel);
+        var parsedWorkflow = appData.ParseWorkflow(workflowJson, name, baseModel, version);
         var saveToFullPath = appData.WorkflowsPath.CombineWith(parsedWorkflow.Path);
         Path.GetDirectoryName(saveToFullPath).AssertDir();
         await File.WriteAllTextAsync(saveToFullPath, workflowJson);