DUI3-126 shared files (#12)

* Account service to get account first from id otherwise from server Url - And other simplications, removing dup code etc. * Add TransportException to all bindings * Register AccountService as singleton and add doc
specklesystems · Jul 9, 2024 · 7cdf863 · 7cdf863
1 parent 9d0635c
commit 7cdf863
Show file tree

Hide file tree

Showing 42 changed files with 217 additions and 149 deletions.
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISReceiveBinding.cs
@@ -6,6 +6,7 @@
 using Speckle.Connectors.Utils;
 using Speckle.Connectors.Utils.Cancellation;
 using Speckle.Connectors.Utils.Operations;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 
@@ -52,11 +53,7 @@ public async Task Receive(string modelCardId)
       // Receive host objects
       var receiveOperationResults = await unitOfWork.Service
         .Execute(
-          modelCard.AccountId.NotNull(), // POC: I hear -you are saying why we're passing them separately. Not sure pass the DUI3-> Connectors.DUI project dependency to the SDK-> Connector.Utils
-          modelCard.ProjectId.NotNull(),
-          modelCard.ProjectName.NotNull(),
-          modelCard.ModelName.NotNull(),
-          modelCard.SelectedVersionId.NotNull(),
+          modelCard.GetReceiveInfo(),
           cts.Token,
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts)
@@ -70,6 +67,10 @@ public async Task Receive(string modelCardId)
         receiveOperationResults.ConversionResults
       );
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     // Catch here specific exceptions if they related to model card.
     catch (OperationCanceledException)
     {

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
@@ -17,6 +17,7 @@
 using Speckle.Connectors.Utils;
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Operations;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.ArcGIS.Bindings;
 
@@ -321,13 +322,6 @@ public async Task Send(string modelCardId)
       // Init cancellation token source -> Manager also cancel it if exist before
       CancellationTokenSource cts = _cancellationManager.InitCancellationTokenSource(modelCardId);
 
-      var sendInfo = new SendInfo(
-        modelCard.AccountId.NotNull(),
-        modelCard.ProjectId.NotNull(),
-        modelCard.ModelId.NotNull(),
-        "ArcGIS"
-      );
-
       var sendResult = await QueuedTask
         .Run(async () =>
         {
@@ -349,7 +343,7 @@ public async Task Send(string modelCardId)
           var result = await unitOfWork.Service
             .Execute(
               mapMembers,
-              sendInfo,
+              modelCard.GetSendInfo("ArcGIS"), // POC: get host app name from settings?
               (status, progress) =>
                 Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts),
               cts.Token
@@ -367,6 +361,10 @@ public async Task Send(string modelCardId)
     {
       Commands.SetModelError(modelCardId, e);
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     catch (OperationCanceledException)
     {
       // SWALLOW -> UI handles it immediately, so we do not need to handle anything

diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
@@ -383,7 +383,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )",
+          "Speckle.Core": "[3.0.1-alpha.15, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -399,7 +399,7 @@
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )"
+          "Speckle.Core": "[3.0.1-alpha.15, )"
         }
       },
       "speckle.converters.arcgis3": {
@@ -455,9 +455,9 @@
       },
       "Speckle.Core": {
         "type": "CentralTransitive",
-        "requested": "[3.0.1-alpha.14, )",
-        "resolved": "3.0.1-alpha.14",
-        "contentHash": "RzQPVIGFFkKvG56YLr8ACtiwdWJE6IJ9vCQ4qHa0PIsUEpfzAIAi59jnzqtByOFC0FiFrFPow9bkfzylaZorAA==",
+        "requested": "[3.0.1-alpha.15, )",
+        "resolved": "3.0.1-alpha.15",
+        "contentHash": "khv7uLeMMZ5JKJi3NZtz2nti7YPFGQiqllIDqVuNAl8hbqJ52t6OWyOJ87n0sthvGtAO2SpaLik3f+Fh5G/7ww==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -436,7 +436,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )",
+          "Speckle.Core": "[3.0.1-alpha.15, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -452,7 +452,7 @@
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )"
+          "Speckle.Core": "[3.0.1-alpha.15, )"
         }
       },
       "speckle.converters.autocad2023": {
@@ -511,9 +511,9 @@
       },
       "Speckle.Core": {
         "type": "CentralTransitive",
-        "requested": "[3.0.1-alpha.14, )",
-        "resolved": "3.0.1-alpha.14",
-        "contentHash": "RzQPVIGFFkKvG56YLr8ACtiwdWJE6IJ9vCQ4qHa0PIsUEpfzAIAi59jnzqtByOFC0FiFrFPow9bkfzylaZorAA==",
+        "requested": "[3.0.1-alpha.15, )",
+        "resolved": "3.0.1-alpha.15",
+        "contentHash": "khv7uLeMMZ5JKJi3NZtz2nti7YPFGQiqllIDqVuNAl8hbqJ52t6OWyOJ87n0sthvGtAO2SpaLik3f+Fh5G/7ww==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadReceiveBinding.cs
@@ -6,6 +6,7 @@
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Utils;
 using Speckle.Connectors.Utils.Operations;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.Autocad.Bindings;
 
@@ -59,11 +60,7 @@ public async Task Receive(string modelCardId)
       // Receive host objects
       var operationResults = await unitOfWork.Service
         .Execute(
-          modelCard.AccountId.NotNull(), // POC: I hear -you are saying why we're passing them separately. Not sure pass the DUI3-> Connectors.DUI project dependency to the SDK-> Connector.Utils
-          modelCard.ProjectId.NotNull(),
-          modelCard.ProjectName.NotNull(),
-          modelCard.ModelName.NotNull(),
-          modelCard.SelectedVersionId.NotNull(),
+          modelCard.GetReceiveInfo(),
           cts.Token,
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts)
@@ -78,6 +75,10 @@ public async Task Receive(string modelCardId)
       // SWALLOW -> UI handles it immediately, so we do not need to handle anything
       return;
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     finally
     {
       // renable document activation

diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs
@@ -13,6 +13,7 @@
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.Utils;
 using Speckle.Connectors.Utils.Caching;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.Autocad.Bindings;
 
@@ -156,17 +157,10 @@ private async Task SendInternal(string modelCardId)
         throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
       }
 
-      var sendInfo = new SendInfo(
-        modelCard.AccountId.NotNull(),
-        modelCard.ProjectId.NotNull(),
-        modelCard.ModelId.NotNull(),
-        _autocadSettings.HostAppInfo.Name
-      );
-
       var sendResult = await uow.Service
         .Execute(
           autocadObjects,
-          sendInfo,
+          modelCard.GetSendInfo(_autocadSettings.HostAppInfo.Name),
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts),
           cts.Token
@@ -181,6 +175,10 @@ private async Task SendInternal(string modelCardId)
       // SWALLOW -> UI handles it immediately, so we do not need to handle anything
       return;
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     catch (SpeckleSendFilterException e)
     {
       Commands.SetModelError(modelCardId, e);

diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
@@ -445,7 +445,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )",
+          "Speckle.Core": "[3.0.1-alpha.15, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -461,7 +461,7 @@
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )"
+          "Speckle.Core": "[3.0.1-alpha.15, )"
         }
       },
       "speckle.converters.civil3d2024": {
@@ -521,9 +521,9 @@
       },
       "Speckle.Core": {
         "type": "CentralTransitive",
-        "requested": "[3.0.1-alpha.14, )",
-        "resolved": "3.0.1-alpha.14",
-        "contentHash": "RzQPVIGFFkKvG56YLr8ACtiwdWJE6IJ9vCQ4qHa0PIsUEpfzAIAi59jnzqtByOFC0FiFrFPow9bkfzylaZorAA==",
+        "requested": "[3.0.1-alpha.15, )",
+        "resolved": "3.0.1-alpha.15",
+        "contentHash": "khv7uLeMMZ5JKJi3NZtz2nti7YPFGQiqllIDqVuNAl8hbqJ52t6OWyOJ87n0sthvGtAO2SpaLik3f+Fh5G/7ww==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
@@ -454,7 +454,7 @@
           "Microsoft.Extensions.Logging.Abstractions": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
           "Speckle.Connectors.Utils": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )",
+          "Speckle.Core": "[3.0.1-alpha.15, )",
           "System.Threading.Tasks.Dataflow": "[6.0.0, )"
         }
       },
@@ -463,7 +463,7 @@
         "dependencies": {
           "Serilog.Extensions.Logging": "[7.0.0, )",
           "Speckle.Autofac": "[1.0.0, )",
-          "Speckle.Core": "[3.0.1-alpha.14, )"
+          "Speckle.Core": "[3.0.1-alpha.15, )"
         }
       },
       "speckle.converters.common": {
@@ -517,9 +517,9 @@
       },
       "Speckle.Core": {
         "type": "CentralTransitive",
-        "requested": "[3.0.1-alpha.14, )",
-        "resolved": "3.0.1-alpha.14",
-        "contentHash": "RzQPVIGFFkKvG56YLr8ACtiwdWJE6IJ9vCQ4qHa0PIsUEpfzAIAi59jnzqtByOFC0FiFrFPow9bkfzylaZorAA==",
+        "requested": "[3.0.1-alpha.15, )",
+        "resolved": "3.0.1-alpha.15",
+        "contentHash": "khv7uLeMMZ5JKJi3NZtz2nti7YPFGQiqllIDqVuNAl8hbqJ52t6OWyOJ87n0sthvGtAO2SpaLik3f+Fh5G/7ww==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",

diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitReceiveBinding.cs
@@ -7,6 +7,7 @@
 using Speckle.Connectors.Utils.Operations;
 using Speckle.Autofac.DependencyInjection;
 using Speckle.Connectors.Utils;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.Revit.Bindings;
 
@@ -54,11 +55,7 @@ public async Task Receive(string modelCardId)
       // Receive host objects
       HostObjectBuilderResult conversionResults = await unitOfWork.Service
         .Execute(
-          modelCard.AccountId.NotNull(), // POC: I hear -you are saying why we're passing them separately. Not sure pass the DUI3-> Connectors.DUI project dependency to the SDK-> Connector.Utils
-          modelCard.ProjectId.NotNull(),
-          modelCard.ProjectName.NotNull(),
-          modelCard.ModelName.NotNull(),
-          modelCard.SelectedVersionId.NotNull(),
+          modelCard.GetReceiveInfo(),
           cts.Token,
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts)
@@ -72,6 +69,10 @@ public async Task Receive(string modelCardId)
         conversionResults.ConversionResults
       );
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     // Catch here specific exceptions if they related to model card.
     catch (OperationCanceledException)
     {

diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs
@@ -12,6 +12,7 @@
 using Speckle.Connectors.Utils.Caching;
 using Speckle.Connectors.Utils.Cancellation;
 using Speckle.Connectors.Utils.Operations;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.Revit.Bindings;
 
@@ -101,17 +102,10 @@ public async Task Send(string modelCardId)
         throw new SpeckleSendFilterException("No objects were found to convert. Please update your publish filter!");
       }
 
-      var sendInfo = new SendInfo(
-        modelCard.AccountId.NotNull(),
-        modelCard.ProjectId.NotNull(),
-        modelCard.ModelId.NotNull(),
-        _revitSettings.HostSlug.NotNull()
-      );
-
       var sendResult = await sendOperation.Service
         .Execute(
           revitObjects,
-          sendInfo,
+          modelCard.GetSendInfo(_revitSettings.HostSlug.NotNull()),
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts),
           cts.Token
@@ -125,6 +119,10 @@ public async Task Send(string modelCardId)
     {
       Commands.SetModelError(modelCardId, e);
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     catch (OperationCanceledException)
     {
       return;

diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/Bindings/RhinoReceiveBinding.cs b/Connectors/Rhino/Speckle.Connectors.Rhino7/Bindings/RhinoReceiveBinding.cs
@@ -7,6 +7,7 @@
 using Speckle.Connectors.Utils.Builders;
 using Speckle.Connectors.Utils.Cancellation;
 using Speckle.Connectors.Utils.Operations;
+using Speckle.Core.Transports;
 
 namespace Speckle.Connectors.Rhino7.Bindings;
 
@@ -54,11 +55,7 @@ public async Task Receive(string modelCardId)
       // Receive host objects
       HostObjectBuilderResult conversionResults = await unitOfWork.Service
         .Execute(
-          modelCard.AccountId.NotNull(), // POC: I hear -you are saying why we're passing them separately. Not sure pass the DUI3-> Connectors.DUI project dependency to the SDK-> Connector.Utils
-          modelCard.ProjectId.NotNull(),
-          modelCard.ProjectName.NotNull(),
-          modelCard.ModelName.NotNull(),
-          modelCard.SelectedVersionId.NotNull(),
+          modelCard.GetReceiveInfo(),
           cts.Token,
           (status, progress) =>
             Commands.SetModelProgress(modelCardId, new ModelCardProgress(modelCardId, status, progress), cts)
@@ -72,6 +69,10 @@ public async Task Receive(string modelCardId)
         conversionResults.ConversionResults
       );
     }
+    catch (TransportException e)
+    {
+      Commands.SetModelError(modelCardId, e);
+    }
     // Catch here specific exceptions if they related to model card.
     catch (OperationCanceledException)
     {