aj/OpenNest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(engine): route console and MCP nesting through named job engines

Browse Source 
Console --engine now names a jobs engine for --autonest (solved once
through NestingEngineRegistry.Create and committed onto the plate) or a
built-in fill strategy for single-plate fill through the public
PlateFillService; unknown names exit with the valid choices instead of
consulting the process-global legacy registry. MCP nesting tools take an
explicit engine argument per call with the session default, never read
process-global active-engine state, and reject whole-job engine names on
single-plate fill tools. NestingEngineRegistry gains an explicit Create
(name) resolution; PlateFillService gains a public ResolveStrategy and a
plate-number Nest overload used by interactive callers.
This commit is contained in:
aj
2026-09-22 00:30:03 -04:00
parent f36e124039
commit 88966d118c
8 changed files with 416 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenNest.Mcp/Tools/NestingTools.cs
+194 -61
View File
@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
@@ -5,6 +6,9 @@ using System.Text;
using System.Threading;
using ModelContextProtocol.Server;
using OpenNest.Engine.Fill;
using OpenNest.Engine.Jobs;
using OpenNest.Engine.Jobs.Adapters;
using OpenNest.Engine.Jobs.Placement;
using OpenNest.Geometry;
using OpenNest.Engine;
@@ -27,7 +31,9 @@ namespace OpenNest.Mcp.Tools
public string FillPlate(
[Description("Index of the plate to fill")] int plateIndex,
[Description("Name of the drawing to fill with")] string drawingName,
[Description("Maximum quantity to place (0 = unlimited)")] int quantity = 0
[Description("Maximum quantity to place (0 = unlimited)")] int quantity = 0,
[Description("Placement strategy: Default, Strip, Vertical Remnant, Horizontal Remnant")]
string engine = null
)
{
var plate = _session.GetPlate(plateIndex);
@@ -38,17 +44,29 @@ namespace OpenNest.Mcp.Tools
if (drawing == null)
return $"Error: drawing '{drawingName}' not found";
var strategy = ResolveStrategy(engine);
if (strategy == null)
return EngineError(engine);
var countBefore = plate.Parts.Count;
var engine = NestEngineRegistry.Create(plate);
var item = new NestItem { Drawing = drawing, Quantity = quantity };
var success = engine.Fill(item);
var parts = PlateFillService.FillItem(
strategy,
plate,
item,
plate.WorkArea(),
null,
CancellationToken.None
);
plate.Parts.AddRange(parts);
var success = parts.Count > 0;
var countAfter = plate.Parts.Count;
var added = countAfter - countBefore;
var sb = new StringBuilder();
sb.AppendLine(
$"Fill plate {plateIndex} with '{drawingName}': {(success ? "success" : "failed")}"
$"Fill plate {plateIndex} with '{drawingName}' ({strategy}): {(success ? "success" : "failed")}"
);
sb.AppendLine($" Parts added: {added}");
sb.AppendLine($" Total parts: {countAfter}");
@@ -66,7 +84,9 @@ namespace OpenNest.Mcp.Tools
[Description("Y origin of the area")] double y,
[Description("Width of the area")] double width,
[Description("Length of the area")] double length,
[Description("Maximum quantity to place (0 = unlimited)")] int quantity = 0
[Description("Maximum quantity to place (0 = unlimited)")] int quantity = 0,
[Description("Placement strategy: Default, Strip, Vertical Remnant, Horizontal Remnant")]
string engine = null
)
{
var plate = _session.GetPlate(plateIndex);
@@ -77,18 +97,30 @@ namespace OpenNest.Mcp.Tools
if (drawing == null)
return $"Error: drawing '{drawingName}' not found";
var strategy = ResolveStrategy(engine);
if (strategy == null)
return EngineError(engine);
var countBefore = plate.Parts.Count;
var engine = NestEngineRegistry.Create(plate);
var item = new NestItem { Drawing = drawing, Quantity = quantity };
var area = new Box(x, y, width, length);
var success = engine.Fill(item, area);
var parts = PlateFillService.FillItem(
strategy,
plate,
item,
area,
null,
CancellationToken.None
);
plate.Parts.AddRange(parts);
var success = parts.Count > 0;
var countAfter = plate.Parts.Count;
var added = countAfter - countBefore;
var sb = new StringBuilder();
sb.AppendLine(
$"Fill area ({x:F1},{y:F1} {width:F1}x{length:F1}) on plate {plateIndex} with '{drawingName}': {(success ? "success" : "failed")}"
$"Fill area ({x:F1},{y:F1} {width:F1}x{length:F1}) on plate {plateIndex} with '{drawingName}' ({strategy}): {(success ? "success" : "failed")}"
);
sb.AppendLine($" Parts added: {added}");
sb.AppendLine($" Total parts: {countAfter}");
@@ -102,7 +134,9 @@ namespace OpenNest.Mcp.Tools
public string FillRemnants(
[Description("Index of the plate")] int plateIndex,
[Description("Name of the drawing to fill with")] string drawingName,
[Description("Maximum quantity per remnant (0 = unlimited)")] int quantity = 0
[Description("Maximum quantity per remnant (0 = unlimited)")] int quantity = 0,
[Description("Placement strategy: Default, Strip, Vertical Remnant, Horizontal Remnant")]
string engine = null
)
{
var plate = _session.GetPlate(plateIndex);
@@ -113,6 +147,10 @@ namespace OpenNest.Mcp.Tools
if (drawing == null)
return $"Error: drawing '{drawingName}' not found";
var strategy = ResolveStrategy(engine);
if (strategy == null)
return EngineError(engine);
var finder = RemnantFinder.FromPlate(plate);
var remnants = finder.FindRemnants();
@@ -123,19 +161,26 @@ namespace OpenNest.Mcp.Tools
sb.AppendLine($"Found {remnants.Count} remnant area(s) on plate {plateIndex}");
var totalAdded = 0;
var engine = NestEngineRegistry.Create(plate);
for (var i = 0; i < remnants.Count; i++)
{
var remnant = remnants[i];
var countBefore = plate.Parts.Count;
var item = new NestItem { Drawing = drawing, Quantity = quantity };
var success = engine.Fill(item, remnant);
var parts = PlateFillService.FillItem(
strategy,
plate,
item,
remnant,
null,
CancellationToken.None
);
plate.Parts.AddRange(parts);
var added = plate.Parts.Count - countBefore;
totalAdded += added;
sb.AppendLine(
$" Remnant {i}: ({remnant.X:F1},{remnant.Y:F1} {remnant.Width:F1}x{remnant.Length:F1}) -> {added} parts {(success ? "" : "(no fit)")}"
$" Remnant {i}: ({remnant.X:F1},{remnant.Y:F1} {remnant.Width:F1}x{remnant.Length:F1}) -> {added} parts {(added > 0 ? "" : "(no fit)")}"
);
}
@@ -152,7 +197,9 @@ namespace OpenNest.Mcp.Tools
public string PackPlate(
[Description("Index of the plate")] int plateIndex,
[Description("Comma-separated drawing names")] string drawingNames,
[Description("Comma-separated quantities for each drawing")] string quantities
[Description("Comma-separated quantities for each drawing")] string quantities,
[Description("Placement strategy: Default, Strip, Vertical Remnant, Horizontal Remnant")]
string engine = null
)
{
var plate = _session.GetPlate(plateIndex);
@@ -165,38 +212,32 @@ namespace OpenNest.Mcp.Tools
if (string.IsNullOrWhiteSpace(quantities))
return "Error: quantities is required";
var names = drawingNames.Split(',').Select(n => n.Trim()).ToArray();
var qtyStrings = quantities.Split(',').Select(q => q.Trim()).ToArray();
var qtys = new int[qtyStrings.Length];
var strategy = ResolveStrategy(engine);
if (strategy == null)
return EngineError(engine);
for (var i = 0; i < qtyStrings.Length; i++)
{
if (!int.TryParse(qtyStrings[i], out qtys[i]))
return $"Error: '{qtyStrings[i]}' is not a valid quantity";
}
var parsed = ParseItems(drawingNames, quantities);
if (parsed.error != null)
return parsed.error;
if (names.Length != qtys.Length)
return $"Error: drawing names count ({names.Length}) does not match quantities count ({qtys.Length})";
var items = new List<NestItem>();
for (var i = 0; i < names.Length; i++)
{
var drawing = _session.GetDrawing(names[i]);
if (drawing == null)
return $"Error: drawing '{names[i]}' not found";
items.Add(new NestItem { Drawing = drawing, Quantity = qtys[i] });
}
var items = parsed.items;
var countBefore = plate.Parts.Count;
var engine = NestEngineRegistry.Create(plate);
var success = engine.Pack(items);
var parts = PlateFillService.PackArea(
strategy,
plate,
plate.WorkArea(),
items,
null,
CancellationToken.None
);
plate.Parts.AddRange(parts);
var success = parts.Count > 0;
var countAfter = plate.Parts.Count;
var added = countAfter - countBefore;
var sb = new StringBuilder();
sb.AppendLine($"Pack plate {plateIndex}: {(success ? "success" : "failed")}");
sb.AppendLine($"Pack plate {plateIndex} ({strategy}): {(success ? "success" : "failed")}");
sb.AppendLine($" Parts added: {added}");
sb.AppendLine($" Total parts: {countAfter}");
sb.AppendLine($" Utilization: {plate.Utilization():P1}");
@@ -211,12 +252,14 @@ namespace OpenNest.Mcp.Tools
[McpServerTool(Name = "autonest_plate")]
[Description(
"Mixed-part autonesting. Fills the plate with multiple different drawings using iterative per-drawing fills with remainder-strip packing."
"Mixed-part autonesting. Solves the drawings as one whole job against the plate using the named jobs engine and commits the resulting placements onto the plate."
)]
public string AutoNestPlate(
[Description("Index of the plate")] int plateIndex,
[Description("Comma-separated drawing names")] string drawingNames,
[Description("Comma-separated quantities for each drawing")] string quantities
[Description("Comma-separated quantities for each drawing")] string quantities,
[Description("Jobs engine name (Default, Strip, Vertical Remnant, Horizontal Remnant, StockLadder)")]
string engine = null
)
{
var plate = _session.GetPlate(plateIndex);
@@ -229,38 +272,61 @@ namespace OpenNest.Mcp.Tools
if (string.IsNullOrWhiteSpace(quantities))
return "Error: quantities is required";
var names = drawingNames.Split(',').Select(n => n.Trim()).ToArray();
var qtyStrings = quantities.Split(',').Select(q => q.Trim()).ToArray();
var qtys = new int[qtyStrings.Length];
var engineName = string.IsNullOrWhiteSpace(engine)
? _session.DefaultEngineName
: engine.Trim();
for (var i = 0; i < qtyStrings.Length; i++)
var parsed = ParseItems(drawingNames, quantities);
if (parsed.error != null)
return parsed.error;
if (parsed.items.Any(item => item.Quantity <= 0))
return "Error: autonest quantities must be positive";
INestingEngine nestingEngine;
try
{
if (!int.TryParse(qtyStrings[i], out qtys[i]))
return $"Error: '{qtyStrings[i]}' is not a valid quantity";
nestingEngine = NestingEngineRegistry.Create(engineName);
}
catch (NotSupportedException)
{
return UnknownEngineMessage(engineName);
}
if (names.Length != qtys.Length)
return $"Error: drawing names count ({names.Length}) does not match quantities count ({qtys.Length})";
var items = new List<NestItem>();
for (var i = 0; i < names.Length; i++)
var jobParts = new List<NestJobPart>(parsed.items.Count);
var drawingsByPartId = new Dictionary<string, Drawing>(StringComparer.Ordinal);
for (var i = 0; i < parsed.items.Count; i++)
{
var drawing = _session.GetDrawing(names[i]);
if (drawing == null)
return $"Error: drawing '{names[i]}' not found";
items.Add(new NestItem { Drawing = drawing, Quantity = qtys[i] });
var partId = $"part-{i}";
jobParts.Add(DrawingJobMapper.FromItem(partId, parsed.items[i]));
drawingsByPartId[partId] = parsed.items[i].Drawing;
}
var engine = NestEngineRegistry.Create(plate);
var nestParts = engine.Nest(items, null, CancellationToken.None);
plate.Parts.AddRange(nestParts);
var totalPlaced = nestParts.Count;
// One physical sheet: this plate, this solve — the runner owns stock accounting.
var stock = DrawingJobMapper.FromPlate("plate-0", plate, 1);
var job = new NestJob(jobParts, [stock]);
var result = nestingEngine.Solve(job, null, CancellationToken.None);
var totalPlaced = 0;
foreach (var plateResult in result.Plates)
{
foreach (var pose in plateResult.Placements)
{
if (!drawingsByPartId.TryGetValue(pose.PartId, out var drawing))
continue;
var part = new Part(drawing);
part.Rotate(pose.Rotation);
part.Location = new Vector(pose.X, pose.Y);
part.UpdateBounds();
plate.Parts.Add(part);
totalPlaced++;
}
}
var sb = new StringBuilder();
sb.AppendLine(
$"AutoNest plate {plateIndex} ({engine.Name} engine): {(totalPlaced > 0 ? "success" : "no parts placed")}"
$"AutoNest plate {plateIndex} ({engineName} engine): {(totalPlaced > 0 ? "success" : "no parts placed")}"
);
sb.AppendLine($" Parts placed: {totalPlaced}");
sb.AppendLine($" Total parts: {plate.Parts.Count}");
@@ -272,5 +338,72 @@ namespace OpenNest.Mcp.Tools
return sb.ToString();
}
/// <summary>
/// Resolves the requested fill strategy, falling back to the session default. Returns null
/// when the name is not a single-plate placement strategy.
/// </summary>
private string ResolveStrategy(string engine)
{
var requested = string.IsNullOrWhiteSpace(engine)
? _session.DefaultEngineName
: engine.Trim();
try
{
return PlateFillService.ResolveStrategy(requested);
}
catch (NotSupportedException)
{
return null;
}
}
private string EngineError(string engine) =>
UnknownEngineMessage(
string.IsNullOrWhiteSpace(engine) ? _session.DefaultEngineName : engine.Trim()
);
private static string UnknownEngineMessage(string engineName)
{
var isJobEngine = NestingEngineRegistry.AvailableEngines.Any(e =>
e.Name.Equals(engineName, StringComparison.OrdinalIgnoreCase)
);
return isJobEngine
? $"Error: engine '{engineName}' is a whole-job engine; this tool supports: {string.Join(", ", PlateFillService.BuiltInStrategies)}. Use autonest_plate for whole-job engines."
: $"Error: unknown engine '{engineName}'. Fill strategies: {string.Join(", ", PlateFillService.BuiltInStrategies)}; jobs engines: {string.Join(", ", NestingEngineRegistry.AvailableEngines.Select(e => e.Name))}";
}
private (List<NestItem> items, string error) ParseItems(string drawingNames, string quantities)
{
var names = drawingNames.Split(',').Select(n => n.Trim()).ToArray();
var qtyStrings = quantities.Split(',').Select(q => q.Trim()).ToArray();
var qtys = new int[qtyStrings.Length];
for (var i = 0; i < qtyStrings.Length; i++)
{
if (!int.TryParse(qtyStrings[i], out qtys[i]))
return (null, $"Error: '{qtyStrings[i]}' is not a valid quantity");
}
if (names.Length != qtys.Length)
return (
null,
$"Error: drawing names count ({names.Length}) does not match quantities count ({qtys.Length})"
);
var items = new List<NestItem>();
for (var i = 0; i < names.Length; i++)
{
var drawing = _session.GetDrawing(names[i]);
if (drawing == null)
return (null, $"Error: drawing '{names[i]}' not found");
items.Add(new NestItem { Drawing = drawing, Quantity = qtys[i] });
}
return (items, null);
}
}
}