fix: refinements to ui avoiding repeating model inputs

This also eliminates "<newline>" only blocks in the masonry ui.

Signed-off-by: Nick Mitchell <[email protected]>

Author: starpit

pdl-live-react/src/view/masonry/model.ts

@@ -8,6 +8,7 @@ import {
   hasParser,
   hasScalarResult,
   hasModelUsage,
+  hasResult,
   hasTimingInformation,
   capitalizeAndUnSnakeCase,
   extractStructuredModelResponse,
@@ -37,10 +38,16 @@ import { hasStabilityMetrics, type StabilityMetric } from "./stability"
 } */
 
 /** Remove objects from the Masonry model that aren't helpful to display */
-function removeFluff({ kind }: { kind?: string }) {
+function removeFluff({ kind, block }: Tile) {
   // re: empty, these house only defs, which are spliced in below via
   // `withDefs()`
-  return kind !== "if" && kind !== "empty"
+  return (
+    kind !== "if" &&
+    kind !== "empty" &&
+    (!hasResult(block) ||
+      typeof block.pdl__result !== "string" ||
+      block.pdl__result.trim().length > 0)
+  )
 }
 
 export default function computeModel(block: import("../../pdl_ast").PdlBlock) {

pdl-live-react/src/view/timeline/model.ts

@@ -64,24 +64,21 @@ export function computeModel(block: unknown | PdlBlock): TimelineModel {
  * blocks.
  */
 function squashProximateModelInputs(model: TimelineModel): TimelineModel {
-  return model
-    .reduceRight((model, row, idx, A) => {
-      if (idx < A.length - 1) {
-        const prior = A[idx + 1].block
-        if (isLLMBlock(prior) && hasInput(prior)) {
-          const lastInput =
-            prior.pdl__model_input[prior.pdl__model_input.length - 1]
-          if (!!lastInput && lastInput.defsite === row.id) {
-            // Skip! We have found block_i such that block_(i+1) is a
-            // model block whose final input message was defined by
-            // block_i. No sense in repeating ourselves...
-            return model
-          }
+  const modelInputDefsites = model.reduce(
+    (M, { block }) => {
+      if (isLLMBlock(block) && hasInput(block)) {
+        const lastInput =
+          block.pdl__model_input[block.pdl__model_input.length - 1]
+        if (lastInput && typeof lastInput.defsite === "string") {
+          M[lastInput.defsite] = true
         }
       }
-      return [...model, row]
-    }, [] as TimelineModel)
-    .reverse()
+      return M
+    },
+    {} as Record<string, boolean>,
+  )
+
+  return model.filter(({ id }) => !modelInputDefsites[id]).filter(nonNullable)
 }
 
 function computeModelIter(