moving IFC to connectors repo

.github/workflows/ci.yml

@@ -46,7 +46,10 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run build
+      - name: ⚒️ Run Build on Linux
+        run: ./build.sh build-linux
+
+      - name: ⚒️ Run tests
         run: ./build.sh test-only
 
       - name: Upload coverage reports to Codecov with GitHub Action

.github/workflows/main.yml

@@ -87,11 +87,17 @@ jobs:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
 
-      - name: ⚒️ Run build
+      - name: ⚒️ Run Build and Pack on Linux
+        run: ./build.sh build-linux
+
+      - name: ⚒️ Run tests
         run: ./build.sh test-only
 
       - name: Upload coverage reports to Codecov with GitHub Action
         uses: codecov/codecov-action@v5
         with:
           file: Converters/**/coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: Push to nuget.org
+        run: dotnet nuget push output/*.nupkg --source "https://api.nuget.org/v3/index.json" --api-key ${{secrets.CONNECTORS_NUGET_TOKEN }} --skip-duplicate

Build/Program.cs

@@ -7,6 +7,7 @@
 const string CLEAN = "clean";
 const string RESTORE = "restore";
 const string BUILD = "build";
+const string BUILD_LINUX = "build-linux";
 const string TEST = "test";
 const string TEST_ONLY = "test-only";
 const string FORMAT = "format";
@@ -183,6 +184,28 @@ void RemoveDirectory(string d)
   }
 );
 
+Target(
+  BUILD_LINUX,
+  DependsOn(FORMAT),
+  Glob.Files(".", "**/Speckle.Importers.Ifc.csproj"),
+  file =>
+  {
+    Run("dotnet", $"restore {file} --locked-mode");
+    var version = Environment.GetEnvironmentVariable("GitVersion_FullSemVer") ?? "3.0.0-localBuild";
+    var fileVersion = Environment.GetEnvironmentVariable("GitVersion_AssemblySemFileVer") ?? "3.0.0.0";
+    Console.WriteLine($"Version: {version} & {fileVersion}");
+    Run(
+      "dotnet",
+      $"build {file} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+    );
+
+    RunAsync(
+      "dotnet",
+      $"pack {file} -c Release -o output --no-build -p:Version={version} -p:FileVersion={fileVersion} -v:m"
+    );
+  }
+);
+
 Target(
   ZIP,
   DependsOn(TEST),

Directory.Packages.props

@@ -1,5 +1,8 @@
 <Project>
   <ItemGroup>
+    <PackageVersion Include="Ara3D.Buffers" Version="1.4.5" />
+    <PackageVersion Include="Ara3D.Logging" Version="1.4.5" />
+    <PackageVersion Include="Ara3D.Utils" Version="1.4.5" />
     <PackageVersion Include="altcover" Version="8.9.3" />
     <PackageVersion Include="Bullseye" Version="5.0.0" />
     <PackageVersion Include="CefSharp.Wpf" Version="92.0.260" />
@@ -44,6 +47,7 @@
     <PackageVersion Include="Speckle.Objects" Version="3.1.0-dev.227" />
     <PackageVersion Include="Speckle.Sdk" Version="3.1.0-dev.227" />
     <PackageVersion Include="Speckle.Sdk.Dependencies" Version="3.1.0-dev.227" />
+    <PackageVersion Include="Speckle.WebIfc" Version="0.0.64-speckle1" />
     <PackageVersion Include="SimpleExec" Version="12.0.0" />
     <GlobalPackageReference Include="PolySharp" Version="1.14.1" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />

Importers/Ifc/Speckle.Importers.Ifc.Tester/DummySendCacheManager.cs

@@ -0,0 +1,28 @@
+using Speckle.Sdk.SQLite;
+
+namespace Speckle.Importers.Ifc.Tester;
+
+public sealed class DummySendCacheManager(Dictionary<string, string> objects) : ISqLiteJsonCacheManager
+{
+  public void Dispose() { }
+
+  public IReadOnlyCollection<(string, string)> GetAllObjects() => throw new NotImplementedException();
+
+  public void DeleteObject(string id) => throw new NotImplementedException();
+
+  public string? GetObject(string id) => null;
+
+  public void SaveObject(string id, string json) => throw new NotImplementedException();
+
+  public bool HasObject(string objectId) => false;
+
+  public void SaveObjects(IEnumerable<(string id, string json)> items)
+  {
+    foreach (var (id, json) in items)
+    {
+      objects[id] = json;
+    }
+  }
+
+  public void UpdateObject(string id, string json) => throw new NotImplementedException();
+}

Importers/Ifc/Speckle.Importers.Ifc.Tester/DummyServerObjectManager.cs

@@ -0,0 +1,43 @@
+using System.Text;
+using Speckle.Sdk.Serialisation.V2;
+using Speckle.Sdk.Serialisation.V2.Send;
+using Speckle.Sdk.Transports;
+
+namespace Speckle.Importers.Ifc.Tester;
+
+public class DummyServerObjectManager : IServerObjectManager
+{
+  public IAsyncEnumerable<(string, string)> DownloadObjects(
+    IReadOnlyCollection<string> objectIds,
+    IProgress<ProgressArgs>? progress,
+    CancellationToken cancellationToken
+  ) => throw new NotImplementedException();
+
+  public Task<string?> DownloadSingleObject(
+    string objectId,
+    IProgress<ProgressArgs>? progress,
+    CancellationToken cancellationToken
+  ) => throw new NotImplementedException();
+
+  public Task<Dictionary<string, bool>> HasObjects(
+    IReadOnlyCollection<string> objectIds,
+    CancellationToken cancellationToken
+  ) => Task.FromResult(objectIds.ToDictionary(id => id, id => false));
+
+  public Task UploadObjects(
+    IReadOnlyList<BaseItem> objects,
+    bool compressPayloads,
+    IProgress<ProgressArgs>? progress,
+    CancellationToken cancellationToken
+  )
+  {
+    long totalBytes = 0;
+    foreach (var item in objects)
+    {
+      totalBytes += Encoding.Default.GetByteCount(item.Json.Value);
+    }
+
+    progress?.Report(new(ProgressEvent.UploadBytes, totalBytes, totalBytes));
+    return Task.CompletedTask;
+  }
+}

Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs

@@ -0,0 +1,65 @@
+#pragma warning disable CA1506
+using System.Diagnostics;
+using Ara3D.Utils;
+//using JetBrains.Profiler.SelfApi;
+using Microsoft.Extensions.DependencyInjection;
+using Speckle.Importers.Ifc;
+using Speckle.Importers.Ifc.Ara3D.IfcParser;
+using Speckle.Importers.Ifc.Converters;
+using Speckle.Importers.Ifc.Tester;
+using Speckle.Importers.Ifc.Types;
+using Speckle.Sdk.Serialisation.V2.Send;
+using Speckle.Sdk.SQLite;
+
+var serviceProvider = Import.GetServiceProvider();
+
+//DotMemory.Init();
+var filePath = new FilePath(
+  //"C:\\Users\\adam\\Git\\speckle-server\\packages\\fileimport-service\\ifc-dotnet\\ifcs\\20210221PRIMARK.ifc"
+  //"C:\\Users\\adam\\Git\\speckle-server\\packages\\fileimport-service\\ifc-dotnet\\ifcs\\231110ADT-FZK-Haus-2005-2006.ifc"
+  //"C:\\Users\\adam\\Downloads\\T03PV06IMPMI01C.ifc"
+  "C:\\Users\\adam\\Downloads\\20231128_HW_Bouwkosten.ifc"
+);
+
+var ifcFactory = serviceProvider.GetRequiredService<IIfcFactory>();
+var stopwatch = Stopwatch.StartNew();
+
+Console.WriteLine($"Opening with WebIFC: {filePath}");
+var model = ifcFactory.Open(filePath);
+var ms = stopwatch.ElapsedMilliseconds;
+Console.WriteLine($"Opened with WebIFC: {ms} ms");
+
+var graph = IfcGraph.Load(new FilePath(filePath));
+var ms2 = stopwatch.ElapsedMilliseconds;
+Console.WriteLine($"Loaded with StepParser: {ms2 - ms} ms");
+
+var converter = serviceProvider.GetRequiredService<IGraphConverter>();
+var b = converter.Convert(model, graph);
+ms = ms2;
+ms2 = stopwatch.ElapsedMilliseconds;
+Console.WriteLine($"Converted to Speckle Bases: {ms2 - ms} ms");
+
+var cache = $"C:\\Users\\adam\\Git\\temp\\{Guid.NewGuid()}.db";
+using var sqlite = new SqLiteJsonCacheManager($"Data Source={cache};", 2);
+using var process2 = new SerializeProcess(
+  new Progress(true),
+  sqlite,
+  new DummyServerObjectManager(),
+  new BaseChildFinder(new BasePropertyGatherer()),
+  new ObjectSerializerFactory(new BasePropertyGatherer()),
+  new SerializeProcessOptions(SkipServer: true)
+);
+Console.WriteLine($"Caching to Speckle: {cache}");
+
+/*var config = new DotMemory.Config();
+config.OpenDotMemory();
+config.SaveToDir("C:\\Users\\adam\\dotTraceSnapshots");
+DotMemory.Attach(config);
+DotMemory.GetSnapshot("Before");*/
+var (rootId, _) = await process2.Serialize(b, default).ConfigureAwait(false);
+Console.WriteLine(rootId);
+ms2 = stopwatch.ElapsedMilliseconds;
+Console.WriteLine($"Converted to JSON: {ms2 - ms} ms");
+//DotMemory.GetSnapshot("After");
+//DotMemory.Detach();
+#pragma warning restore CA1506

Importers/Ifc/Speckle.Importers.Ifc.Tester/Progress.cs

@@ -0,0 +1,36 @@
+using Speckle.Sdk.Transports;
+
+namespace Speckle.Importers.Ifc.Tester;
+
+public class Progress(bool write) : IProgress<ProgressArgs>
+{
+  private readonly TimeSpan _debounce = TimeSpan.FromMilliseconds(1000);
+  private DateTime _lastTime = DateTime.UtcNow;
+
+  private long _totalBytes;
+
+  public void Report(ProgressArgs value)
+  {
+    if (write)
+    {
+      if (value.ProgressEvent == ProgressEvent.DownloadBytes)
+      {
+        Interlocked.Add(ref _totalBytes, value.Count);
+      }
+      var now = DateTime.UtcNow;
+      if (now - _lastTime >= _debounce)
+      {
+        if (value.ProgressEvent == ProgressEvent.DownloadBytes)
+        {
+          Console.WriteLine(value.ProgressEvent + " t " + _totalBytes);
+        }
+        else
+        {
+          Console.WriteLine(value.ProgressEvent + " c " + value.Count + " t " + value.Total);
+        }
+
+        _lastTime = now;
+      }
+    }
+  }
+}

Importers/Ifc/Speckle.Importers.Ifc.Tester/Speckle.Importers.Ifc.Tester.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <Configurations>Debug;Release;Local</Configurations>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Speckle.Importers.Ifc\Speckle.Importers.Ifc.csproj" />
+    </ItemGroup>
+
+</Project>