Skip to content

Commit

Permalink
Cancellationmanager revamp (#527)
Browse files Browse the repository at this point in the history 
* rhino and arc fix usage

* fix registration

* fix the rest

* use interface

* don't use rhino layer if there is no name

* formatting

* add tests

* formatting

* add to local and move

* Update OTEL to remove grpc dependency

* Fix deprecated method

* really fixed with no incremental builds for tests

* Fix references and lock

* Update nuggets
  • Loading branch information
@adamhathcock
adamhathcock authored Feb 3, 2025
1 parent e9f3701 commit e5e02bd
Show file tree
Hide file tree
Showing 92 changed files with 1,814 additions and 1,355 deletions.
4 changes: 2 additions & 2 deletions Build/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,10 @@ void RemoveDirectory(string d)
Glob.Files(".", "**/*.Tests.csproj"),
file =>
{
Run("dotnet", $"restore {file} --locked-mode");
Run("dotnet", $"build {file} -c Release --no-incremental");
Run(
"dotnet",
$"test {file} -c Release --no-restore --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning"
$"test {file} -c Release --no-build --verbosity=minimal /p:AltCover=true /p:AltCoverAttributeFilter=ExcludeFromCodeCoverage /p:AltCoverVerbosity=Warning"
);
}
);
Expand Down
10 changes: 5 additions & 5 deletions Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Speckle.Connectors.ArcGIS.Bindings;
public sealed class ArcGISReceiveBinding : IReceiveBinding
{
public string Name { get; } = "receiveBinding";
private readonly CancellationManager _cancellationManager;
private readonly ICancellationManager _cancellationManager;
private readonly DocumentModelStore _store;
private readonly IServiceProvider _serviceProvider;
private readonly IOperationProgressManager _operationProgressManager;
Expand All @@ -32,7 +32,7 @@ public sealed class ArcGISReceiveBinding : IReceiveBinding
public ArcGISReceiveBinding(
DocumentModelStore store,
IBrowserBridge parent,
CancellationManager cancellationManager,
ICancellationManager cancellationManager,
IServiceProvider serviceProvider,
IOperationProgressManager operationProgressManager,
ILogger<ArcGISReceiveBinding> logger,
Expand Down Expand Up @@ -60,7 +60,7 @@ public async Task Receive(string modelCardId)
throw new InvalidOperationException("No download model card was found.");
}

CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);
using var scope = _serviceProvider.CreateScope();
scope
.ServiceProvider.GetRequiredService<IConverterSettingsStore<ArcGISConversionSettings>>()
Expand All @@ -76,8 +76,8 @@ public async Task Receive(string modelCardId)
.ServiceProvider.GetRequiredService<ReceiveOperation>()
.Execute(
modelCard.GetReceiveInfo("ArcGIS"), // POC: get host app name from settings? same for GetSendInfo
_operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
cancellationToken
_operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
cancellationItem.Token
);

modelCard.BakedObjectIds = receiveOperationResults.BakedObjectIds.ToList();
Expand Down
10 changes: 5 additions & 5 deletions Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public sealed class ArcGISSendBinding : ISendBinding
private readonly DocumentModelStore _store;
private readonly IServiceProvider _serviceProvider;
private readonly List<ISendFilter> _sendFilters;
private readonly CancellationManager _cancellationManager;
private readonly ICancellationManager _cancellationManager;
private readonly ISendConversionCache _sendConversionCache;
private readonly IOperationProgressManager _operationProgressManager;
private readonly ILogger<ArcGISSendBinding> _logger;
Expand All @@ -64,7 +64,7 @@ public ArcGISSendBinding(
IBrowserBridge parent,
IEnumerable<ISendFilter> sendFilters,
IServiceProvider serviceProvider,
CancellationManager cancellationManager,
ICancellationManager cancellationManager,
ISendConversionCache sendConversionCache,
IOperationProgressManager operationProgressManager,
ILogger<ArcGISSendBinding> logger,
Expand Down Expand Up @@ -372,7 +372,7 @@ public async Task Send(string modelCardId)
throw new InvalidOperationException("No publish model card was found.");
}

CancellationToken cancellationToken = _cancellationManager.InitCancellationTokenSource(modelCardId);
using var cancellationItem = _cancellationManager.GetCancellationItem(modelCardId);

using var scope = _serviceProvider.CreateScope();
scope
Expand Down Expand Up @@ -415,8 +415,8 @@ public async Task Send(string modelCardId)
.Execute(
mapMembers,
modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings? same for GetReceiveInfo
_operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationToken),
cancellationToken
_operationProgressManager.CreateOperationProgressEventHandler(Parent, modelCardId, cancellationItem.Token),
cancellationItem.Token
);

await Commands.SetModelSendResult(modelCardId, sendResult.RootObjId, sendResult.ConversionResults);
Expand Down
34 changes: 17 additions & 17 deletions Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,18 +226,18 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )",
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui.webview": {
Expand All @@ -261,7 +261,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -299,18 +299,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.249"
"Speckle.Sdk": "3.1.0-dev.251"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
Expand All @@ -320,14 +320,14 @@
"Microsoft.Extensions.Logging": "[2.2.0]",
"Speckle.DoubleNumerics": "4.0.1",
"Speckle.Newtonsoft.Json": "13.0.2",
"Speckle.Sdk.Dependencies": "3.1.0-dev.249"
"Speckle.Sdk.Dependencies": "3.1.0-dev.251"
}
},
"Speckle.Sdk.Dependencies": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g=="
}
},
"net6.0-windows7.0/win-x64": {
Expand Down
34 changes: 17 additions & 17 deletions Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,18 +259,18 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )",
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui.webview": {
Expand All @@ -294,7 +294,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -338,18 +338,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.249"
"Speckle.Sdk": "3.1.0-dev.251"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
Expand All @@ -359,14 +359,14 @@
"Microsoft.Extensions.Logging": "[2.2.0]",
"Speckle.DoubleNumerics": "4.0.1",
"Speckle.Newtonsoft.Json": "13.0.2",
"Speckle.Sdk.Dependencies": "3.1.0-dev.249"
"Speckle.Sdk.Dependencies": "3.1.0-dev.251"
}
},
"Speckle.Sdk.Dependencies": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g=="
}
}
}
Expand Down
34 changes: 17 additions & 17 deletions Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,18 +259,18 @@
"dependencies": {
"Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
"Speckle.Connectors.Logging": "[1.0.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )",
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui": {
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Connectors.Common": "[1.0.0, )",
"Speckle.Sdk": "[3.1.0-dev.249, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
"Speckle.Sdk": "[3.1.0-dev.251, )",
"Speckle.Sdk.Dependencies": "[3.1.0-dev.251, )"
}
},
"speckle.connectors.dui.webview": {
Expand All @@ -294,7 +294,7 @@
"type": "Project",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
"Speckle.Objects": "[3.1.0-dev.249, )"
"Speckle.Objects": "[3.1.0-dev.251, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
Expand Down Expand Up @@ -338,18 +338,18 @@
},
"Speckle.Objects": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "p3fXmlqoKGCRKuo2Z15JrpPhVSTeUG5jSliLlq1mHQBGLwei93mXORJnJYxPcTR5QPzKbCyRnYjqcUknsghxXQ==",
"dependencies": {
"Speckle.Sdk": "3.1.0-dev.249"
"Speckle.Sdk": "3.1.0-dev.251"
}
},
"Speckle.Sdk": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "ycwfr6+TRfS5XdYpALpKFxs2VFV/kvRYdfKWEw01Qtg2NaGGpnQzINfFzh72Jbi5XoH1RZt2dPDdNwJbpSsG0A==",
"dependencies": {
"GraphQL.Client": "6.0.0",
"Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
Expand All @@ -359,14 +359,14 @@
"Microsoft.Extensions.Logging": "[2.2.0]",
"Speckle.DoubleNumerics": "4.0.1",
"Speckle.Newtonsoft.Json": "13.0.2",
"Speckle.Sdk.Dependencies": "3.1.0-dev.249"
"Speckle.Sdk.Dependencies": "3.1.0-dev.251"
}
},
"Speckle.Sdk.Dependencies": {
"type": "CentralTransitive",
"requested": "[3.1.0-dev.249, )",
"resolved": "3.1.0-dev.249",
"contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
"requested": "[3.1.0-dev.251, )",
"resolved": "3.1.0-dev.251",
"contentHash": "M8MNH+yeIkEmhnb4GxrKyewCotaP+MZ+FUbkuHDaMbnG7xbJ0Y83nDA7v77v2v/UczCFmdVqroFnV4i6OQew7g=="
}
}
}
Expand Down
Loading

0 comments on commit e5e02bd

Please sign in to comment.