mirror of
https://github.com/OPCFoundation/UA-.NETStandard.git
synced 2026-10-21 00:56:28 +08:00
da7412c429
## Summary - support the xRegistry 0.6.0 distinct Resource/Version hierarchy: `Registry -> Group -> Resource -> Versions -> Version` - instantiate stable logical Resource nodes separately from exact Version nodes while preserving existing Version NodeIds - delegate logical Resource FileType operations and Version-view metadata to the selected default Version with handle pinning and shared writer reservations - make Resource and Version delete behavior role-stable and use `MetaEpoch` / `Epoch` respectively - use stable Resource SourceNodes, exact Version SourceNodes and the `Server -> Registry -> Group -> Resource -> Version` notifier chain - keep a model-metadata-gated client fallback for 0.5 flat Servers; 0.6 Servers expose no legacy aliases - target `HasWoTProjection` at the real stable logical Resource node - use `AsyncCustomNodeManager` for the registration, fast-path, and federation managers, with awaited lifecycle, node mutations, event delivery, and cleanup - handle startup rollback, reentrant deletion callbacks, undisclosed file handles, and retryable cleanup without blocking unrelated file operations ## Authoritative dependencies - companion specification: OPCF-Members/spec-drafts#32 at `d3399fca025025a73e5a6b599f850a81d985c060` - OPC UA binding: xregistry/spec#568 - xRegistry event semantics: xregistry/spec#563, merged as `66ee31e47fbadff6ab982ae1516f7d9065e46b64` - companion NodeSet SHA-256: `369f5f3f1814b333e4eeb52bfb4b6a730cdff372505a5f91a54c94f0016ac4cf` ## Review feedback - keep the WoT Connectivity information-model designation at `1.1`; draft revisions update the publication date without changing the model version - eliminate all 198 unique CA1861 diagnostics across 54 files and remove seven obsolete project suppressions - fix the analyzer-clean touched-path CA1307 and the hierarchy follow-up CA1846/CA1851 diagnostics without dropping legacy-TFM compatibility - recover the reconcile queue after callback faults/cancellation and continue accepted pending changes - remove migration guidance for the xRegistry managers, which are new in 2.0 ## Compatibility - public WoT Connectivity model designation remains `1.1` - generated event-record ABI, constructors, options, NodeIds, and stored documents remain compatible - the generic xRegistry managers are new in 2.0 and implement `IAsyncNodeManager`; use `IAsyncNodeManagerFactory` and the async lifecycle hooks (see `docs\XRegistry.md`) - persistence schema and document blobs remain compatible unless noted below ## Validation - merge validation at `980422f76` with upstream `e8bec27d5`: 454 targeted WoT/materialization/model/registry cases and all 327 XRegistry cases passed on both net10.0 and net48; all 29 net10 aggregation sample cases passed - feedback regressions at `308e8ba74`: 55 targeted queue and live registry event/projection/lifecycle cases passed on each of net10.0 and net48 - prior CI: all 266 checks passed at `6489a0908`; the unchanged Ubuntu Core certificate-counter test and dependent jobs passed on the one-time retry ([run 34117304035, attempt 2](https://github.com/OPCFoundation/UA-.NETStandard/actions/runs/34117304035/attempts/2)) - `Opc.Ua.XRegistry.Tests` — 327 passed on net10.0 and net48 for migration commit `32c914aaf` - `Opc.Ua.WotCon.Tests` net10.0 — 1348 passed - `Opc.Ua.WotCon.Bindings.Tests` net10.0 — 683 passed - `Opc.Ua.SourceGeneration.Core.Tests` net10.0 — 3807 passed, 8 skipped - `Opc.Ua.SourceGeneration.Tests` net10.0 — 145 passed - `Opc.Ua.SourceGeneration.Stack.Tests` net10.0 — 94 passed - affected XRegistry and WoT client/server projects build successfully - xRegistry NodeSet is byte-identical to the companion artifact - repository-wide CA1861 inventory — 198 unique diagnostics across 54 files reduced to zero - targeted changed-fixture validation — 1,098 passed, 3 skipped, 0 failed - constrained full `UA.slnx` net10.0 Release build — CA1861 = 0 - `Opc.Ua.XRegistry.Client` net472 and netstandard2.1 builds — 0 warnings, 0 errors - independent shared-array safety review — no significant issues - `git diff --check` The final review regressions cover concurrent reconcile/open, synthetic logical handle collisions across default switches, cross-session Close isolation, shared writer reservations, logical FileType property/change propagation, logical Labels delegation, role-fixed deletion, event sources, model-version gating, and stable `HasWoTProjection` targets. The companion specification and protocol binding are reviewed in the linked PRs above. --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 5c79a1ed-6dab-4522-a9fc-6548caa78ad5 Copilot-Session: b605797f-a97a-4cd0-8f12-016d33c2fd88 Copilot-Session: 7ef369a5-2307-4f71-8a11-15af0e72f240 Copilot-Session: e716d455-8397-4d22-9c5a-398847ab7317
230 lines
11 KiB
C#
230 lines
11 KiB
C#
/* ========================================================================
|
|
* Copyright (c) 2005-2026 The OPC Foundation, Inc. All rights reserved.
|
|
*
|
|
* OPC Foundation MIT License 1.00
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation
|
|
* files (the "Software"), to deal in the Software without
|
|
* restriction, including without limitation the rights to use,
|
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following
|
|
* conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* The complete license agreement can be found here:
|
|
* http://opcfoundation.org/License/MIT/1.00/
|
|
* ======================================================================*/
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Globalization;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using NUnit.Framework;
|
|
using Opc.Ua.Vision.Client;
|
|
using Opc.Ua.Vision.Intent.Tests.Infrastructure;
|
|
|
|
namespace Opc.Ua.Vision.Intent.Tests
|
|
{
|
|
/// <summary>
|
|
/// Proves the on-server perception path: a client asks the pipeline
|
|
/// to run inference, the Server publishes a <c>DetectionResultType</c>
|
|
/// as a real address-space node, and composing the resulting pose
|
|
/// through the frame tree lands on the part's authored world
|
|
/// position. The composition residual is the ground truth of "did
|
|
/// the loop work" — the test pins it to machine precision because
|
|
/// the frame tree is authored as identity rotations.
|
|
/// </summary>
|
|
[TestFixture]
|
|
[Category("Vision")]
|
|
[Category("Integration")]
|
|
[NonParallelizable]
|
|
public sealed class VisionOnServerPerceptionTests
|
|
{
|
|
[SetUp]
|
|
public async Task SetUpAsync()
|
|
{
|
|
m_fixture = new VisionIntentServerFixture();
|
|
await m_fixture.StartAsync().ConfigureAwait(false);
|
|
}
|
|
|
|
[TearDown]
|
|
public async Task TearDownAsync()
|
|
{
|
|
if (m_fixture != null)
|
|
{
|
|
await m_fixture.DisposeAsync().ConfigureAwait(false);
|
|
}
|
|
}
|
|
|
|
[Test]
|
|
public async Task RunInferenceProducesDetectionResultWithLabelledParts()
|
|
{
|
|
await using VisionIntentClientContext context = await m_fixture
|
|
.ConnectAsync("on-server-inference").ConfigureAwait(false);
|
|
NodeId pipelineNodeId = await ResolveSinglePipelineAsync(context)
|
|
.ConfigureAwait(false);
|
|
VisionPipelineClient pipeline = context.Vision.Pipeline(pipelineNodeId);
|
|
|
|
string resultId = await pipeline.RunInferenceAsync().ConfigureAwait(false);
|
|
Assert.That(resultId, Is.Not.Null.And.Not.Empty,
|
|
"RunInference must return the stable ResultId of the published result.");
|
|
|
|
VisionDetectionResultSnapshot snapshot = await ReadSingleResultAsync(pipeline, context)
|
|
.ConfigureAwait(false);
|
|
List<VisionDetectionDataType> detections = SnapshotDetections(snapshot);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(snapshot.ResultId, Is.EqualTo(resultId));
|
|
Assert.That(snapshot.ModelVersionUsed, Is.EqualTo("test-groundtruth-1"));
|
|
Assert.That(snapshot.FrameId, Is.EqualTo(TestVisionCell.CameraFrameId));
|
|
Assert.That(detections, Has.Count.EqualTo(2),
|
|
"Both authored parts should be detected in the initial bin state.");
|
|
Assert.That(detections.Select(d => d.ClassLabel),
|
|
Is.EquivalentTo(s_stringValues1));
|
|
Assert.That(detections.All(d => d.Confidence >= 0.0 && d.Confidence <= 1.0), Is.True,
|
|
"All confidences must live in [0, 1].");
|
|
Assert.That(detections.All(d => d.HasBoundingBox2D), Is.True,
|
|
"The ground-truth detector reports a bounding box for every part.");
|
|
Assert.That(detections.All(d => d.HasPose), Is.True,
|
|
"Every detection must carry a 6-DoF pose.");
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
public async Task ComposingDetectionPoseIntoWorldLandsOnAuthoredPartPosition()
|
|
{
|
|
await using VisionIntentClientContext context = await m_fixture
|
|
.ConnectAsync("on-server-compose").ConfigureAwait(false);
|
|
NodeId pipelineNodeId = await ResolveSinglePipelineAsync(context)
|
|
.ConfigureAwait(false);
|
|
VisionPipelineClient pipeline = context.Vision.Pipeline(pipelineNodeId);
|
|
_ = await pipeline.RunInferenceAsync().ConfigureAwait(false);
|
|
VisionDetectionResultSnapshot snapshot = await ReadSingleResultAsync(pipeline, context)
|
|
.ConfigureAwait(false);
|
|
|
|
IReadOnlyDictionary<string, NodeId> framesByName = await BuildFrameMapAsync(context)
|
|
.ConfigureAwait(false);
|
|
NodeId cameraFrameNodeId = framesByName["CameraEih"];
|
|
NodeId worldFrameNodeId = framesByName["World"];
|
|
VisionFrameGraph graph = context.Vision.Frames();
|
|
|
|
List<VisionDetectionDataType> detections = SnapshotDetections(snapshot);
|
|
VisionDetectionDataType cubeDetection = detections.Single(d => d.ClassLabel == "TestCube");
|
|
VisionPose3DDataType cubePoseInCamera = cubeDetection.Pose;
|
|
VisionPose3DDataType cubePoseInWorld = await graph.ComposeAsync(
|
|
cubePoseInCamera, cameraFrameNodeId, worldFrameNodeId).ConfigureAwait(false);
|
|
|
|
var authored = new[] { 0.700, 0.100, 0.600 };
|
|
double dx = cubePoseInWorld.Position[0] - authored[0];
|
|
double dy = cubePoseInWorld.Position[1] - authored[1];
|
|
double dz = cubePoseInWorld.Position[2] - authored[2];
|
|
double residual = Math.Sqrt((dx * dx) + (dy * dy) + (dz * dz));
|
|
string message =
|
|
"On-server pose composition residual for TestCube = " +
|
|
residual.ToString("E3", CultureInfo.InvariantCulture) +
|
|
" m (world pose = (" +
|
|
cubePoseInWorld.Position[0].ToString("F9", CultureInfo.InvariantCulture) +
|
|
", " +
|
|
cubePoseInWorld.Position[1].ToString("F9", CultureInfo.InvariantCulture) +
|
|
", " +
|
|
cubePoseInWorld.Position[2].ToString("F9", CultureInfo.InvariantCulture) +
|
|
")). " +
|
|
"Frames traversed: camera_eih → flange → base → world.";
|
|
TestContext.Progress.WriteLine(message);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.That(cubePoseInWorld.Position, Has.Count.EqualTo(3));
|
|
Assert.That(cubePoseInWorld.Position[0],
|
|
Is.EqualTo(authored[0]).Within(1e-9),
|
|
"Composed X must equal the authored world X for TestCube.");
|
|
Assert.That(cubePoseInWorld.Position[1],
|
|
Is.EqualTo(authored[1]).Within(1e-9),
|
|
"Composed Y must equal the authored world Y for TestCube.");
|
|
Assert.That(cubePoseInWorld.Position[2],
|
|
Is.EqualTo(authored[2]).Within(1e-9),
|
|
"Composed Z must equal the authored world Z for TestCube.");
|
|
Assert.That(residual, Is.LessThan(1e-9),
|
|
"Total residual must be at machine precision for identity rotations.");
|
|
});
|
|
}
|
|
|
|
private static async Task<NodeId> ResolveSinglePipelineAsync(VisionIntentClientContext context)
|
|
{
|
|
ArrayOf<NodeId> pipelines = await context.Vision.DiscoverPipelinesAsync()
|
|
.ConfigureAwait(false);
|
|
Assert.That(pipelines.Count, Is.EqualTo(1),
|
|
"The test cell must expose exactly one pipeline.");
|
|
NodeId nodeId = pipelines[0];
|
|
Assert.That(nodeId.IsNull, Is.False, "Pipeline NodeId must resolve.");
|
|
return nodeId;
|
|
}
|
|
|
|
private static async Task<VisionDetectionResultSnapshot> ReadSingleResultAsync(
|
|
VisionPipelineClient pipeline, VisionIntentClientContext context)
|
|
{
|
|
List<VisionNodeEntry> results = new();
|
|
await foreach (VisionNodeEntry entry in pipeline.EnumerateResultsAsync())
|
|
{
|
|
results.Add(entry);
|
|
}
|
|
Assert.That(results, Is.Not.Empty,
|
|
"The pipeline should have published at least one result after RunInference.");
|
|
VisionNodeEntry chosen = results[^1];
|
|
VisionResultReader reader = context.Vision.Result(chosen.NodeId);
|
|
// Keep the awaited result local because RCS1174 does not account for the await foreach above.
|
|
// TODO: Remove when the analyzer tracks preceding asynchronous enumeration.
|
|
#pragma warning disable RCS1124
|
|
VisionDetectionResultSnapshot snapshot = await reader.ReadDetectionAsync().ConfigureAwait(false);
|
|
return snapshot;
|
|
#pragma warning restore RCS1124
|
|
}
|
|
|
|
private static List<VisionDetectionDataType> SnapshotDetections(
|
|
VisionDetectionResultSnapshot snapshot)
|
|
{
|
|
var buffer = new List<VisionDetectionDataType>(snapshot.Detections.Count);
|
|
for (int ii = 0; ii < snapshot.Detections.Count; ii++)
|
|
{
|
|
buffer.Add(snapshot.Detections[ii]);
|
|
}
|
|
return buffer;
|
|
}
|
|
|
|
private static async Task<IReadOnlyDictionary<string, NodeId>> BuildFrameMapAsync(
|
|
VisionIntentClientContext context)
|
|
{
|
|
var map = new Dictionary<string, NodeId>(StringComparer.Ordinal);
|
|
await foreach (VisionNodeEntry frame in context.Vision.EnumerateFramesAsync())
|
|
{
|
|
string? key = frame.BrowseName.Name;
|
|
if (!string.IsNullOrEmpty(key))
|
|
{
|
|
map[key] = frame.NodeId;
|
|
}
|
|
}
|
|
Assert.That(map.Keys, Is.EquivalentTo(s_stringValues2));
|
|
return map;
|
|
}
|
|
|
|
private VisionIntentServerFixture m_fixture = null!;
|
|
|
|
private static readonly string[] s_stringValues1 = ["TestCube", "TestCylinder"];
|
|
private static readonly string[] s_stringValues2 = ["World", "Base", "Flange", "CameraEih"];
|
|
}
|
|
}
|