progress on consuming results, but now we overflow ?

nodepen · Jul 20, 2023 · b23b2aa · b23b2aa
1 parent 5d8f4cf
commit b23b2aa
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 17 deletions.
diff --git a/apps/nodepen-client/components/NodesAppContainer.tsx b/apps/nodepen-client/components/NodesAppContainer.tsx
@@ -61,7 +61,7 @@ const NodesAppContainer = ({ document: initialDocument, templates }: NodesAppCon
           stream(id: $streamId) {
             object(id: $objectId) {
               data
-              children(query: $nodeSolutionDataTypeQuery, select: ["NodeRuntimeData"]) {
+              children(query: $nodeSolutionDataTypeQuery, select: ["NodeInstanceId", "NodeRuntimeData"]) {
                 totalCount
                 objects {
                   data
@@ -99,20 +99,41 @@ const NodesAppContainer = ({ document: initialDocument, templates }: NodesAppCon
 
       const { data: streamSolutionData, children: nodeSolutionData } = data.stream.object
 
-      const documentSolutionData = streamSolutionData['SolutionData']
-
-      console.log(documentSolutionData)
+      const documentSolutionData: NodePen.DocumentSolutionData = {
+        solutionId: streamSolutionData['SolutionData']['SolutionId'],
+        documentRuntimeData: {
+          durationMs: streamSolutionData['SolutionData']['DocumentRuntimeData']['DurationMs'],
+        },
+        nodeSolutionData: [],
+      }
+
+      for (const node of nodeSolutionData.objects) {
+        const { data: currentNodeSolutionData } = node
+
+        documentSolutionData.nodeSolutionData.push({
+          nodeInstanceId: currentNodeSolutionData['NodeInstanceId'],
+          nodeRuntimeData: {
+            durationMs: currentNodeSolutionData['NodeRuntimeData']['DurationMs'],
+            messages: currentNodeSolutionData['NodeRuntimeData']['Messages'].map((message: any) => ({
+              level: message['Level'],
+              message: message['Message'],
+            })),
+          },
+          portSolutionData: [],
+        })
+      }
 
-      return data
+      return documentSolutionData
     }
 
     requestSolution()
       .then((rootObjectId) => {
         setStreamRootObjectId(rootObjectId)
         return fetchSolutionRuntimeData(rootObjectId)
       })
-      .then((solutionData) => {
-        // Do nothing
+      .then((documentSolutionData) => {
+        console.log(documentSolutionData)
+        // TODO: Drop it into state
       })
   }, [])
 

diff --git a/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs b/apps/rhino-compute-server/Endpoints/GrasshopperEndpoints.cs
@@ -59,18 +59,12 @@ public Response SolveGrasshopperDocument(NancyContext context)
       definition.Profiler = GH_ProfilerMode.Processor;
 
       // Solve Grasshopper document
-      Stopwatch documentSolutionTimer = new Stopwatch();
-
-      documentSolutionTimer.Start();
-
       definition.NewSolution(true, GH_SolutionMode.Silent);
 
-      documentSolutionTimer.Stop();
-
       // Collect document solution data
       var documentSolutionData = new NodePenDocumentSolutionData(requestData.SolutionId);
 
-      documentSolutionData.DocumentRuntimeData.DurationMs = documentSolutionTimer.ElapsedMilliseconds;
+      documentSolutionData.DocumentRuntimeData.DurationMs = definition.SolutionSpan.Milliseconds;
 
       // Collect node solution data
       foreach (IGH_DocumentObject documentObject in definition.Objects)

diff --git a/apps/rhino-compute-server/Rhino.Compute.csproj b/apps/rhino-compute-server/Rhino.Compute.csproj
@@ -25,6 +25,7 @@
     <PackageReference Include="Nancy.Owin" Version="1.4.1" />
     <!-- <PackageReference Include="Speckle.Objects.Converter.Grasshopper7" Version="2.14.2" /> -->
     <!-- <PackageReference Include="NewtonSoft.Json" Version="13.0.1" /> -->
+    <PackageReference Include="Rhino.Inside" Version="7.0.0" />
     <PackageReference Include="Topshelf" Version="4.1.0" />
   </ItemGroup>
 

diff --git a/packages/converters/Nodepen.Converters.csproj b/packages/converters/Nodepen.Converters.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Rhino.Inside" Version="7.0.0" />
+    <!-- <PackageReference Include="Rhino.Inside" Version="7.0.0" /> -->
     <PackageReference Include="Speckle.Objects" Version="2.14.2" />
     <PackageReference Include="Speckle.Objects.Converter.Grasshopper7" Version="2.14.2" />
   </ItemGroup>

diff --git a/packages/converters/kits/NodePenDocumentSolutionDataKit.cs b/packages/converters/kits/NodePenDocumentSolutionDataKit.cs
@@ -195,7 +195,8 @@ public NodePenDataTreeValue ConvertToSpeckle<T>(GH_Goo<T> goo)
             {
                 Type = goo.TypeName.ToLower(),
                 Description = goo.ToString(),
-                Value = nativeGeometry.ToString(),
+                // Value = nativeGeometry.ToString(),
+                Value = "",
                 Geometry = speckleGeometry,
             };
 

diff --git a/packages/converters/models/NodePenDocumentSolutionData.cs b/packages/converters/models/NodePenDocumentSolutionData.cs
@@ -46,7 +46,7 @@ public class NodePenDocumentRuntimeData : Base
         /// The number of milliseconds the document took to execute during a given solution.
         /// </summary>
         [JsonProperty("durationMs")]
-        public long DurationMs { get; set; } = 0;
+        public int DurationMs { get; set; } = 0;
 
         public NodePenDocumentRuntimeData()
         {