Report progress before saving SQLite

.github/workflows/pr.yml

@@ -11,7 +11,7 @@ jobs:
       uses: actions/checkout@v5
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 8.x.x
         

.github/workflows/release.yml

@@ -2,22 +2,17 @@ name: .NET Build and Publish
 
 on:
   push:
-    tags: ["3.*.*"]
+    tags: ["3.*"]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment:
-      name: 'nuget.org'
-    permissions:
-      id-token: write  # enable GitHub OIDC token issuance for this job
-
     steps:
       - name: Checkout
         uses: actions/checkout@v5
-
+        
       - name: Setup .NET
-        uses: actions/setup-dotnet@v5
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.x.x
 
@@ -25,7 +20,7 @@ jobs:
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-
+          
       - id: set-version
         name: Set version to output
         run: |
@@ -42,24 +37,18 @@ jobs:
 
           echo $SEMVER
           echo $FILE_VERSION
-
+              
       - name: 🔫 Build and Pack
         run: ./build.sh pack
         env:
           SEMVER: ${{ steps.set-version.outputs.SEMVER }}
           FILE_VERSION: ${{ steps.set-version.outputs.FILE_VERSION }}
-
+          
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5
         with:
           files: tests/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
-      - name: NuGet login (OIDC → temp API key)
-        uses: NuGet/login@v1
-        id: login
-        with:
-          user: ${{ secrets.NUGET_USER }}
-
       - name: Push to nuget.org
-        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{steps.login.outputs.NUGET_API_KEY}}
+        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.CONNECTORS_NUGET_TOKEN }} --skip-duplicate

src/Speckle.Objects/Other/RenderMaterial.cs

@@ -35,6 +35,6 @@ public class RenderMaterial : Base
   public Color emissiveColor
   {
     get => Color.FromArgb(emissive);
-    set => emissive = value.ToArgb();
+    set => diffuse = value.ToArgb();
   }
 }

src/Speckle.Sdk/Api/GraphQL/Models/ServerInfo.cs

@@ -19,9 +19,6 @@ public sealed class ServerInfo
   [Obsolete("Don't use")]
   public bool frontend2 { get; set; } = true;
 
-  /// <summary>
-  /// The URL that should be used to talk with the server
-  /// </summary>
   /// <remarks>
   /// This field is not returned from the GQL API,
   /// it should be populated after construction.

src/Speckle.Sdk/Api/Operations/Operations.Receive.cs

@@ -2,7 +2,6 @@ using Microsoft.Extensions.Logging;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Serialisation;
-using Speckle.Sdk.Serialisation.V2.Receive;
 using Speckle.Sdk.Transports;
 
 namespace Speckle.Sdk.Api;
@@ -23,8 +22,7 @@ public partial class Operations
     string objectId,
     string? authorizationToken,
     IProgress<ProgressArgs>? onProgressAction,
-    CancellationToken cancellationToken,
-    DeserializeProcessOptions? options = null
+    CancellationToken cancellationToken
   )
   {
     using var receiveActivity = activityFactory.Start("Operations.Receive");
@@ -38,8 +36,7 @@ public partial class Operations
       streamId,
       authorizationToken,
       onProgressAction,
-      cancellationToken,
-      options
+      cancellationToken
     );
     try
     {
@@ -47,11 +44,6 @@ public partial class Operations
       receiveActivity?.SetStatus(SdkActivityStatusCode.Ok);
       return result;
     }
-    catch (OperationCanceledException)
-    {
-      //this is handled by the caller
-      throw;
-    }
     catch (Exception ex)
     {
       receiveActivity?.SetStatus(SdkActivityStatusCode.Error);

src/Speckle.Sdk/Api/Operations/Operations.Send.cs

@@ -25,8 +25,7 @@ public partial class Operations
     string? authorizationToken,
     Base value,
     IProgress<ProgressArgs>? onProgressAction,
-    CancellationToken cancellationToken,
-    SerializeProcessOptions? options = null
+    CancellationToken cancellationToken
   )
   {
     using var receiveActivity = activityFactory.Start("Operations.Send");
@@ -39,8 +38,7 @@ public partial class Operations
       streamId,
       authorizationToken,
       onProgressAction,
-      cancellationToken,
-      options
+      cancellationToken
     );
     try
     {

src/Speckle.Sdk/Credentials/Account.cs

@@ -59,20 +59,15 @@ public class Account : IEquatable<Account>
 
   #region public methods
 
-
-  /// <remarks>The logic is aligned with <c>distinct_id</c> mixpanel property</remarks>
-  /// <exception cref="ArgumentNullException">Thrown if <see name="userInfo.email"/> was <see langword="null"/></exception>
   public string GetHashedEmail()
   {
-    string email = userInfo.email.NotNull();
+    string email = userInfo?.email ?? "unknown";
     return "@" + Md5.GetString(email).ToUpperInvariant();
   }
 
-  /// <remarks>The logic is aligned with <c>server</c> mixpanel property</remarks>
-  /// <exception cref="ArgumentNullException">Thrown if <see name="serverInfo.url"/> was <see langword="null"/></exception>
   public string GetHashedServer()
   {
-    string url = serverInfo.url.NotNull();
+    string url = serverInfo?.url ?? AccountManager.DEFAULT_SERVER_URL;
     return Md5.GetString(CleanURL(url)).ToUpperInvariant();
   }
 
@@ -102,8 +97,6 @@ public class Account : IEquatable<Account>
 
   #endregion
 
-  internal const string LOCAL_IDENTIFIER_DEPRECATION_MESSAGE = "Local identifiers no longer nesseary";
-
   /// <summary>
   /// Retrieves the local identifier for the current user.
   /// </summary>
@@ -128,6 +121,5 @@ public class Account : IEquatable<Account>
   ///     https://speckle.xyz?id=123
   ///   </code>
   /// </example>
-  [Obsolete(LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   internal Uri GetLocalIdentifier() => new($"{serverInfo.url}?id={userInfo.id}");
 }

src/Speckle.Sdk/Credentials/AccountManager.cs

@@ -419,7 +419,6 @@ public sealed class AccountManager(
   /// <remarks>
   /// <inheritdoc cref="Account.GetLocalIdentifier"/>
   /// </remarks>
-  [Obsolete(Account.LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   public Uri? GetLocalIdentifierForAccount(Account account)
   {
     var identifier = account.GetLocalIdentifier();
@@ -441,7 +440,6 @@ public sealed class AccountManager(
   /// </summary>
   /// <param name="localIdentifier">The local identifier of the account.</param>
   /// <returns>The account that matches the local identifier, or null if no match is found.</returns>
-  [Obsolete(Account.LOCAL_IDENTIFIER_DEPRECATION_MESSAGE)]
   public Account? GetAccountForLocalIdentifier(Uri localIdentifier)
   {
     var searchResult = GetAccounts()

src/Speckle.Sdk/Logging/SpecklePathProvider.cs

@@ -9,8 +9,6 @@ public static class SpecklePathProvider
 {
   private const string APPLICATION_NAME = "Speckle";
 
-  private const string LOG_FOLDER_NAME = "Logs";
-
   private const string BLOB_FOLDER_NAME = "Blobs";
 
   private const string ACCOUNTS_FOLDER_NAME = "Accounts";
@@ -45,7 +43,7 @@ public static class SpecklePathProvider
   /// <see cref="Environment.SpecialFolder.ApplicationData"/> path usually maps to
   /// <ul>
   ///   <li>win: <c>%appdata%/</c></li>
-  ///   <li>MacOS: <c>~/Library/Application Support</c></li>
+  ///   <li>MacOS: <c>~/.config/</c></li>
   ///   <li>Linux: <c>~/.config/</c></li>
   /// </ul>
   /// </remarks>
@@ -59,18 +57,29 @@ public static class SpecklePathProvider
       return pathOverride;
     }
 
+    // on desktop linux and macos we use the appdata.
+    // but we might not have write access to the disk
+    // so the catch falls back to the user profile
     try
     {
       return Environment.GetFolderPath(
         Environment.SpecialFolder.ApplicationData,
-        // It's not a given that the folder is already there on all OS-es, so we'll create it
+        // if the folder doesn't exist, we get back an empty string on OSX,
+        // which in turn, breaks other stuff down the line.
+        // passing in the Create option ensures that this directory exists,
+        // which is not a given on all OS-es.
         Environment.SpecialFolderOption.Create
       );
     }
-    catch (PlatformNotSupportedException)
+    catch (SystemException ex) when (ex is PlatformNotSupportedException or ArgumentException)
     {
-      // We might not have write access to the disk to create the folder,
-      // so we'll fall back to the user profile
+      //Adding this log just so we confidently know which Exception type to catch here.
+      // TODO: Must re-add log call when (and if) this get's made as a service
+      //SpeckleLog.Logger.Warning(ex, "Falling back to user profile path");
+
+      // on server linux, there might not be a user setup, things can run under root
+      // in that case, the appdata variable is most probably not set up
+      // we fall back to the value of the home folder
       return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
     }
   }
@@ -87,7 +96,4 @@ public static class SpecklePathProvider
     Directory.CreateDirectory(path);
     return path;
   }
-
-  public static string LogFolderPath(string applicationAndVersion) =>
-    EnsureFolderExists(UserSpeckleFolderPath, LOG_FOLDER_NAME, applicationAndVersion);
 }

src/Speckle.Sdk/Models/GraphTraversal/GraphTraversal.cs

@@ -109,9 +109,9 @@ public abstract class GraphTraversal<T>
         break;
       case IList list:
       {
-        for (int i = list.Count - 1; i >= 0; i--)
+        foreach (object? obj in list)
         {
-          TraverseMemberToStack(stack, list[i], memberName, parent);
+          TraverseMemberToStack(stack, obj, memberName, parent);
         }
 
         break;

src/Speckle.Sdk/Serialisation/V2/MemoryServerObjectManager.cs

@@ -9,7 +9,6 @@ public class MemoryServerObjectManager(ConcurrentDictionary<string, string> obje
 {
   public virtual async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )

src/Speckle.Sdk/Serialisation/V2/Receive/DeserializeProcess.cs

@@ -14,8 +14,7 @@ public record DeserializeProcessOptions(
   bool ThrowOnMissingReferences = true,
   bool SkipInvalidConverts = false,
   int? MaxParallelism = null,
-  bool SkipServer = false,
-  string? AttributeMask = null
+  bool SkipServer = false
 );
 
 public partial interface IDeserializeProcess : IAsyncDisposable;
@@ -45,7 +44,6 @@ public sealed class DeserializeProcess(
       new ObjectLoader(
         sqLiteJsonCacheManager,
         serverObjectManager,
-        options?.AttributeMask,
         progress,
         loggerFactory.CreateLogger<ObjectLoader>(),
         cancellationToken

src/Speckle.Sdk/Serialisation/V2/Receive/ObjectLoader.cs

@@ -16,7 +16,6 @@ public partial interface IObjectLoader : IDisposable;
 public sealed class ObjectLoader(
   ISqLiteJsonCacheManager sqLiteJsonCacheManager,
   IServerObjectManager serverObjectManager,
-  string? attributeMask,
   IProgress<ProgressArgs>? progress,
   ILogger<ObjectLoader> logger,
   CancellationToken cancellationToken
@@ -112,7 +111,6 @@ public sealed class ObjectLoader(
     await foreach (
       var (id, json) in serverObjectManager.DownloadObjects(
         ids.Select(x => x.NotNull()).ToList(),
-        attributeMask,
         progress,
         cancellationToken
       )

src/Speckle.Sdk/Serialisation/V2/Send/BaseSerializer.cs

@@ -21,7 +21,12 @@ public class BaseSerializer(
   public IReadOnlyDictionary<Id, ObjectReference> ObjectReferences => _objectReferences;
 
   //leave this sync
-  public IEnumerable<BaseItem> Serialise(Base obj, bool skipCacheRead, CancellationToken cancellationToken)
+  public IEnumerable<BaseItem> Serialise(
+    Base obj,
+    IReadOnlyDictionary<Id, NodeInfo> childInfo,
+    bool skipCacheRead,
+    CancellationToken cancellationToken
+  )
   {
     if (!skipCacheRead && obj.id != null)
     {
@@ -33,7 +38,7 @@ public class BaseSerializer(
       }
     }
 
-    using var serializer2 = objectSerializerFactory.Create(cancellationToken);
+    using var serializer2 = objectSerializerFactory.Create(childInfo, cancellationToken);
     var items = _pool.Get();
     try
     {

src/Speckle.Sdk/Serialisation/V2/Send/ObjectSaver.cs

@@ -20,10 +20,10 @@ public sealed class ObjectSaver(
   ISqLiteJsonCacheManager sqLiteJsonCacheManager,
   IServerObjectManager serverObjectManager,
   ILogger<ObjectSaver> logger,
-  SerializeProcessOptions options,
-  CancellationToken cancellationToken
+  CancellationToken cancellationToken,
 #pragma warning disable CS9107
 #pragma warning disable CA2254
+  SerializeProcessOptions? options = null
 ) : ChannelSaver<BaseItem>, IObjectSaver
 #pragma warning restore CA2254
 #pragma warning restore CS9107

src/Speckle.Sdk/Serialisation/V2/Send/ObjectSerializer.cs

@@ -26,6 +26,8 @@ public sealed class ObjectSerializer : IObjectSerializer
 {
   private HashSet<object> _parentObjects = new();
 
+  private readonly IReadOnlyDictionary<Id, NodeInfo> _childCache;
+
   private readonly IBasePropertyGatherer _propertyGatherer;
   private readonly CancellationToken _cancellationToken;
 
@@ -50,6 +52,7 @@ public sealed class ObjectSerializer : IObjectSerializer
   /// <param name="cancellationToken"></param>
   public ObjectSerializer(
     IBasePropertyGatherer propertyGatherer,
+    IReadOnlyDictionary<Id, NodeInfo> childCache,
     Pool<List<(Id, Json, Closures)>> chunksPool,
     Pool<List<DataChunk>> chunks2Pool,
     Pool<List<object?>> chunks3Pool,
@@ -57,6 +60,7 @@ public sealed class ObjectSerializer : IObjectSerializer
   )
   {
     _propertyGatherer = propertyGatherer;
+    _childCache = childCache;
     _chunksPool = chunksPool;
     _chunks2Pool = chunks2Pool;
     _chunks3Pool = chunks3Pool;
@@ -295,14 +299,28 @@ public sealed class ObjectSerializer : IObjectSerializer
 
   private (Id, Json)? SerializeDetachedBase(Base baseObj, Closures closures)
   {
-    Closures childClosures = [];
-    var sb = Pools.StringBuilders.Get();
-    using var writer = new StringWriter(sb);
-    using var jsonWriter = SpeckleObjectSerializerPool.Instance.GetJsonTextWriter(writer);
-    var id = SerializeBaseWithClosures(baseObj, jsonWriter, childClosures, true);
-    var json = new Json(writer.ToString());
-    Pools.StringBuilders.Return(sb);
-    closures.IncrementClosures(childClosures);
+    Closures childClosures;
+    Id id;
+    Json json;
+    //avoid multiple serialization to get closures
+    if (baseObj.id != null && _childCache.TryGetValue(new(baseObj.id), out var info))
+    {
+      id = new Id(baseObj.id);
+      childClosures = info.GetClosures(_cancellationToken);
+      json = info.Json;
+      closures.IncrementClosures(childClosures);
+    }
+    else
+    {
+      childClosures = [];
+      var sb = Pools.StringBuilders.Get();
+      using var writer = new StringWriter(sb);
+      using var jsonWriter = SpeckleObjectSerializerPool.Instance.GetJsonTextWriter(writer);
+      id = SerializeBaseWithClosures(baseObj, jsonWriter, childClosures, true);
+      closures.IncrementClosures(childClosures);
+      json = new Json(writer.ToString());
+      Pools.StringBuilders.Return(sb);
+    }
     var json2 = ReferenceGenerator.CreateReference(id);
     closures.MergeClosure(id);
     // add to obj refs to return

src/Speckle.Sdk/Serialisation/V2/Send/ObjectSerializerFactory.cs

@@ -12,6 +12,6 @@ public class ObjectSerializerFactory(IBasePropertyGatherer propertyGatherer) : I
   private readonly Pool<List<DataChunk>> _chunk2Pool = Pools.CreateListPool<DataChunk>();
   private readonly Pool<List<object?>> _chunk3Pool = Pools.CreateListPool<object?>();
 
-  public IObjectSerializer Create(CancellationToken cancellationToken) =>
-    new ObjectSerializer(propertyGatherer, _chunkPool, _chunk2Pool, _chunk3Pool, cancellationToken);
+  public IObjectSerializer Create(IReadOnlyDictionary<Id, NodeInfo> baseCache, CancellationToken cancellationToken) =>
+    new ObjectSerializer(propertyGatherer, baseCache, _chunkPool, _chunk2Pool, _chunk3Pool, cancellationToken);
 }

src/Speckle.Sdk/Serialisation/V2/Send/SerializeProcess.cs

@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Speckle.InterfaceGenerator;
@@ -36,8 +37,8 @@ public sealed class SerializeProcess(
   IBaseChildFinder baseChildFinder,
   IBaseSerializer baseSerializer,
   ILoggerFactory loggerFactory,
-  SerializeProcessOptions options,
-  CancellationToken cancellationToken
+  CancellationToken cancellationToken,
+  SerializeProcessOptions? options = null
 ) : ISerializeProcess
 {
   private static readonly Dictionary<Id, NodeInfo> EMPTY_CLOSURES = new();
@@ -63,8 +64,13 @@ public sealed class SerializeProcess(
     ThreadPriority.BelowNormal,
     Environment.ProcessorCount * 2
   );
+  private readonly SerializeProcessOptions _options = options ?? new();
 
   private readonly Pool<Dictionary<Id, NodeInfo>> _currentClosurePool = Pools.CreateDictionaryPool<Id, NodeInfo>();
+  private readonly Pool<ConcurrentDictionary<Id, NodeInfo>> _childClosurePool = Pools.CreateConcurrentDictionaryPool<
+    Id,
+    NodeInfo
+  >();
 
   private readonly Pool<List<Task<Dictionary<Id, NodeInfo>>>> _taskResultPool = Pools.CreateListPool<
     Task<Dictionary<Id, NodeInfo>>
@@ -107,13 +113,13 @@ public sealed class SerializeProcess(
     try
     {
       var channelTask = objectSaver.Start(
-        options.MaxParallelism,
-        options.MaxHttpSendBatchSize,
-        options.MaxCacheBatchSize,
+        options?.MaxParallelism,
+        options?.MaxHttpSendBatchSize,
+        options?.MaxCacheBatchSize,
         _processSource.Token
       );
       var findTotalObjectsTask = Task.CompletedTask;
-      if (!options.SkipFindTotalObjects)
+      if (!_options.SkipFindTotalObjects)
       {
         ThrowIfFailed();
         findTotalObjectsTask = Task.Factory.StartNew(
@@ -219,6 +225,7 @@ public sealed class SerializeProcess(
         return EMPTY_CLOSURES;
       }
 
+      var childClosures = _childClosurePool.Get();
       foreach (var childClosure in taskClosures)
       {
         if (IsCancelled())
@@ -227,6 +234,7 @@ public sealed class SerializeProcess(
         }
         foreach (var kvp in childClosure)
         {
+          childClosures[kvp.Key] = kvp.Value;
           if (IsCancelled())
           {
             return EMPTY_CLOSURES;
@@ -241,7 +249,7 @@ public sealed class SerializeProcess(
         return EMPTY_CLOSURES;
       }
 
-      var items = baseSerializer.Serialise(obj, options.SkipCacheRead, _processSource.Token);
+      var items = baseSerializer.Serialise(obj, childClosures, _options.SkipCacheRead, _processSource.Token);
 
       if (IsCancelled())
       {
@@ -249,27 +257,33 @@ public sealed class SerializeProcess(
       }
 
       var currentClosures = _currentClosurePool.Get();
-
-      Interlocked.Increment(ref _objectCount);
-      progress?.Report(new(ProgressEvent.FromCacheOrSerialized, _objectCount, Math.Max(_objectCount, _objectsFound)));
-      foreach (var item in items)
+      try
       {
-        if (IsCancelled())
+        Interlocked.Increment(ref _objectCount);
+        progress?.Report(new(ProgressEvent.FromCacheOrSerialized, _objectCount, Math.Max(_objectCount, _objectsFound)));
+        foreach (var item in items)
         {
-          return EMPTY_CLOSURES;
-        }
+          if (IsCancelled())
+          {
+            return EMPTY_CLOSURES;
+          }
 
-        if (item.NeedsStorage)
-        {
-          Interlocked.Increment(ref _objectsSerialized);
-          await objectSaver.SaveAsync(item).ConfigureAwait(false);
-        }
+          if (item.NeedsStorage)
+          {
+            Interlocked.Increment(ref _objectsSerialized);
+            await objectSaver.SaveAsync(item).ConfigureAwait(false);
+          }
 
-        if (!currentClosures.ContainsKey(item.Id))
-        {
-          currentClosures.Add(item.Id, new NodeInfo(item.Json, item.Closures));
+          if (!currentClosures.ContainsKey(item.Id))
+          {
+            currentClosures.Add(item.Id, new NodeInfo(item.Json, item.Closures));
+          }
         }
       }
+      finally
+      {
+        _childClosurePool.Return(childClosures);
+      }
 
       return currentClosures;
     }

src/Speckle.Sdk/Serialisation/V2/SerializeProcessFactory.cs

@@ -44,14 +44,13 @@ public class SerializeProcessFactory(
         sqLiteJsonCacheManager,
         serverObjectManager,
         loggerFactory.CreateLogger<ObjectSaver>(),
-        options ?? new SerializeProcessOptions(),
         cancellationToken
       ),
       baseChildFinder,
       new BaseSerializer(sqLiteJsonCacheManager, objectSerializerFactory),
       loggerFactory,
-      options ?? new SerializeProcessOptions(),
-      cancellationToken
+      cancellationToken,
+      options
     );
 
   public ISerializeProcess CreateSerializeProcess(

src/Speckle.Sdk/Serialisation/V2/ServerObjectManager.cs

@@ -51,7 +51,6 @@ public class ServerObjectManager : IServerObjectManager
 
   public async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )
@@ -60,14 +59,10 @@ public class ServerObjectManager : IServerObjectManager
     cancellationToken.ThrowIfCancellationRequested();
 
     using var childrenHttpMessage = new HttpRequestMessage();
-    childrenHttpMessage.RequestUri = new Uri($"/api/v2/projects/{_streamId}/object-stream/", UriKind.Relative);
+    childrenHttpMessage.RequestUri = new Uri($"/api/getobjects/{_streamId}", UriKind.Relative);
     childrenHttpMessage.Method = HttpMethod.Post;
 
-    Dictionary<string, object> postParameters = new() { { "objectIds", objectIds } };
-    if (!string.IsNullOrWhiteSpace(attributeMask))
-    {
-      postParameters.Add("attributeMask", attributeMask.NotNull());
-    }
+    Dictionary<string, string> postParameters = new() { { "objects", JsonConvert.SerializeObject(objectIds) } };
     string serializedPayload = JsonConvert.SerializeObject(postParameters);
     childrenHttpMessage.Content = new StringContent(serializedPayload, Encoding.UTF8, "application/json");
     childrenHttpMessage.Headers.Add("Accept", "text/plain");

tests/Speckle.Objects.Tests.Unit/Serialization/ObjectsSerializationTest.cs

@@ -18,7 +18,10 @@ public sealed class ObjectsSerializationTest
 
   private static IReadOnlyList<(Id, Json, Dictionary<Id, int>)> Serialize(Base data)
   {
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
+      new Dictionary<Id, NodeInfo>(),
+      default
+    );
     return serializer.Serialize(data).ToList();
   }
 

tests/Speckle.Sdk.Serialization.Tests/DataObjectTests.cs

@@ -41,7 +41,7 @@ public class DataObjectTests
       new DummyServerObjectManager(),
       null,
       default,
-      new SerializeProcessOptions(false, false, true, true)
+      new SerializeProcessOptions(true, true, false, true)
     );
     await serializeProcess.Serialize(x);
     await VerifyJson(json.Single().Value.Value).UseParameters(type);

tests/Speckle.Sdk.Serialization.Tests/DetachedTests.cs

@@ -41,7 +41,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true)
+      new SerializeProcessOptions(false, false, true, true)
     );
     await serializeProcess.Serialize(@base);
 
@@ -123,7 +123,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -150,7 +150,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -172,7 +172,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
+      new SerializeProcessOptions(false, false, true, true) { MaxParallelism = 1, MaxHttpSendBatchSize = 1 }
     );
     var results = await serializeProcess.Serialize(@base);
 
@@ -239,7 +239,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true)
+      new SerializeProcessOptions(false, false, true, true)
     );
 
     var results = await serializeProcess.Serialize(@base);
@@ -272,7 +272,7 @@ public class DetachedTests
       objects,
       null,
       default,
-      new SerializeProcessOptions(true, true, false, true)
+      new SerializeProcessOptions(false, false, true, true)
     );
     var results = await serializeProcess.Serialize(@base);
     await VerifyJsonDictionary(objects);
@@ -338,7 +338,6 @@ public class DummyServerObjectManager : IServerObjectManager
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

tests/Speckle.Sdk.Serialization.Tests/ExceptionTests.cs

@@ -112,7 +112,6 @@ public class ExceptionTests
       new DummySqLiteReceiveManager(new Dictionary<string, string>()),
       new ExceptionServerObjectManager(),
       null,
-      null,
       new NullLogger<ObjectLoader>(),
       default
     );
@@ -204,7 +203,7 @@ public class ExceptionTests
   public void Test_SpeckleSerializerException()
   {
     var factory = new ObjectSerializerFactory(new BasePropertyGatherer());
-    var serializer = factory.Create(default);
+    var serializer = factory.Create(new Dictionary<Id, NodeInfo>(), default);
     Assert.Throws<SpeckleSerializeException>(() =>
     {
       var _ = serializer.Serialize(new BadBase()).ToList();

tests/Speckle.Sdk.Serialization.Tests/ExternalIdTests.cs

@@ -3,6 +3,7 @@ using Speckle.Objects.Primitive;
 using Speckle.Sdk.Host;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Extensions;
+using Speckle.Sdk.Serialisation;
 using Speckle.Sdk.Serialisation.V2.Send;
 
 namespace Speckle.Sdk.Serialization.Tests;
@@ -19,7 +20,10 @@ public class ExternalIdTests
   public async Task ExternalIdTest_Detached()
   {
     var p = new Polyline() { units = "cm", value = [1, 2] };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
+      new Dictionary<Id, NodeInfo>(),
+      default
+    );
     var objects = serializer.Serialize(p).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -41,7 +45,10 @@ public class ExternalIdTests
       knots = [],
       weights = [],
     };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
+      new Dictionary<Id, NodeInfo>(),
+      default
+    );
     var objects = serializer.Serialize(curve).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -64,7 +71,10 @@ public class ExternalIdTests
       weights = [],
     };
     var polycurve = new Polycurve() { segments = [curve], units = "cm" };
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
+      new Dictionary<Id, NodeInfo>(),
+      default
+    );
     var objects = serializer.Serialize(polycurve).ToDictionary(x => x.Item1, x => x.Item2);
 
     await VerifyJsonDictionary(objects);
@@ -89,7 +99,10 @@ public class ExternalIdTests
     var polycurve = new Polycurve() { segments = [curve], units = "cm" };
     var @base = new Base();
     @base.SetDetachedProp("profile", polycurve);
-    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(default);
+    using var serializer = new ObjectSerializerFactory(new BasePropertyGatherer()).Create(
+      new Dictionary<Id, NodeInfo>(),
+      default
+    );
     var objects = serializer.Serialize(@base).ToDictionary(x => x.Item1, x => x.Item2);
     await VerifyJsonDictionary(objects);
   }

tests/Speckle.Sdk.Serialization.Tests/Framework/ExceptionServerObjectManager.cs

@@ -8,7 +8,6 @@ public class ExceptionServerObjectManager : IServerObjectManager
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

tests/Speckle.Sdk.Serialization.Tests/SerializationTests.cs

@@ -150,7 +150,7 @@ public class SerializationTests
     id.Should().Be(newId.Value);
   }
 
-  [Theory(Skip = "Takes too long")]
+  [Theory]
   [InlineData("RevitObject.json.gz", "3416d3fe01c9196115514c4a2f41617b", 7818)]
   public async Task Roundtrip_Test_Old(string fileName, string _, int count)
   {
@@ -186,6 +186,8 @@ public class SerializationTests
 
   [Theory]
   [InlineData(1)]
+  [InlineData(2)]
+  [InlineData(3)]
   [InlineData(4)]
   public async Task Roundtrip_Test_New(int concurrency)
   {
@@ -202,7 +204,6 @@ public class SerializationTests
         new DummySqLiteReceiveManager(closures),
         new DummyReceiveServerObjectManager(closures),
         null,
-        null,
         new NullLogger<ObjectLoader>(),
         default
       )

tests/Speckle.Sdk.Serialization.Tests/ServerObjectManagerTests.cs

@@ -31,17 +31,14 @@ public class ServerObjectManagerTests : MoqTest
     var jObject = new JObject { { "id", id }, { "value", true } };
     var jObject2 = new JObject { { "id", id2 }, { "value", true } };
     var mockHttp = new MockHttpMessageHandler();
-    Dictionary<string, object> postParameters = new()
+    Dictionary<string, string> postParameters = new()
     {
-      {
-        "objectIds",
-        new List<string> { id, id2 }
-      },
+      { "objects", JsonConvert.SerializeObject(new List<string> { id, id2 }) },
     };
 
     string serializedPayload = JsonConvert.SerializeObject(postParameters);
     mockHttp
-      .When(HttpMethod.Post, $"http://localhost/api/v2/projects/{streamId}/object-stream/")
+      .When(HttpMethod.Post, $"http://localhost/api/getobjects/{streamId}")
       .WithContent(serializedPayload)
       .Respond(
         "application/json",
@@ -62,7 +59,7 @@ public class ServerObjectManagerTests : MoqTest
       token,
       new(timeout: TimeSpan.FromSeconds(timeout))
     );
-    var results = serverObjectManager.DownloadObjects(new List<string> { id, id2 }, null, null, ct);
+    var results = serverObjectManager.DownloadObjects(new List<string> { id, id2 }, null, ct);
     var objects = new JObject();
     await foreach (var (x, json) in results)
     {

tests/Speckle.Sdk.Testing/Framework/DummyReceiveServerObjectManager.cs

@@ -10,7 +10,6 @@ public class DummyReceiveServerObjectManager(IReadOnlyDictionary<string, string>
 {
   public async IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     [EnumeratorCancellation] CancellationToken cancellationToken
   )

tests/Speckle.Sdk.Testing/Framework/DummySendServerObjectManager.cs

@@ -9,7 +9,6 @@ public class DummySendServerObjectManager(ConcurrentDictionary<string, string> s
 {
   public IAsyncEnumerable<(string, string)> DownloadObjects(
     IReadOnlyCollection<string> objectIds,
-    string? attributeMask,
     IProgress<ProgressArgs>? progress,
     CancellationToken cancellationToken
   ) => throw new NotImplementedException();

tests/Speckle.Sdk.Tests.Unit/Serialisation/SerializeProcessRecordExceptionTests.cs

@@ -31,7 +31,6 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
-      new(),
       cts.Token
     );
     var ex = new Exception("Test error");
@@ -68,7 +67,6 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
-      new(),
       cts.Token
     );
     var ex = new OperationCanceledException();
@@ -100,7 +98,6 @@ public class SerializeProcessRecordExceptionTests : MoqTest
       baseChildFinderMock.Object,
       baseSerializerMock.Object,
       loggerFactoryMock.Object,
-      new(),
       cts.Token
     );
     var ex = new AggregateException(new OperationCanceledException());