Improve reported conversation view.

Katharine · Katharine · commit a2e6b672cda3 · 2025-05-03T13:30:26.000-07:00
Signed-off-by: Katharine Berry &lt;ktbry@google.com&gt;
diff --git a/service/assistant/feedback/report.html b/service/assistant/feedback/report.html
@@ -31,14 +31,24 @@
         }
         pre {
             margin: 0;
+            white-space: pre-wrap;
         }
         .widget {
             font-family: monospace;
         }
+        .response-text {
+            white-space:  pre-wrap;
+        }
+        summary {
+            font-weight: bold;
+            font-size: large;
+            cursor: pointer;
+        }
     </style>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/lua.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/languages/json.min.js"></script>
 </head>
 <body>
 <h1>Reported thread</h1>
@@ -52,16 +62,16 @@ <h1>Reported thread</h1>
 <div class="context-storage">
     <h2>Context Storage</h2>
     {{if .ContextStorage.POIs}}
-    <h3>POIs</h3>
-    <ol>
-        {{range .ContextStorage.POIs}}
-            <li><code>{{.}}</code></li>
-        {{end}}
-    </ol>
+    <details>
+        <summary>POIs</summary>
+        <pre>{{jsonify .ContextStorage.POIs}}</pre>
+    </details>
     {{end}}
     {{if .ContextStorage.LastRoute}}
-    <h3>Last Route</h3>
-    <p><code>{{.ContextStorage.LastRoute}}</code></p>
+    <details>
+        <summary>Last Route</summary>
+        <pre>{{jsonify .ContextStorage.LastRoute}}</pre>
+    </details>
     {{end}}
 </div>
 {{end}}
@@ -101,21 +111,7 @@ <h3>Last Route</h3>
         {{else if .FunctionResponse}}
         <div class="turn function">
             <p class="speaker">Function: <code>{{.FunctionResponse.Name}}</code></p>
-            <div class="function_args">
-                <table>
-                    <tr>
-                        <th>Key</th>
-                        <th>Value</th>
-                    </tr>
-                    {{$fn:=.FunctionResponse.Name}}
-                    {{range $key, $value := .FunctionResponse.Response}}
-                        <tr>
-                            <td><code>{{$key}}</code></td>
-                            <td><pre class="arg-{{$fn}}-{{$key}}">{{$value}}</pre></td>
-                        </tr>
-                    {{end}}
-                </table>
-            </div>
+            <pre class="language-json">{{jsonify .FunctionResponse.Response}}</pre></td>
         </div>
         {{end}}
     {{end}}
@@ -131,6 +127,14 @@ <h3>Last Route</h3>
     for (let code of luaCode) {
         hljs.highlightElement(code);
     }
+    let nonLuaCode = document.querySelectorAll('.turn.function pre');
+    for (let code of nonLuaCode) {
+        hljs.highlightElement(code);
+    }
+    var storedContext = document.querySelectorAll('.context-storage pre');
+    for (let code of storedContext) {
+        hljs.highlightElement(code);
+    }
 </script>
 </body>
 </html>
diff --git a/service/assistant/feedback/show_report.go b/service/assistant/feedback/show_report.go
@@ -16,6 +16,7 @@ package feedback
 
 import (
 	_ "embed"
+	"encoding/json"
 	"github.com/pebble-dev/bobby-assistant/service/assistant/util/storage"
 	"html/template"
 	"log"
@@ -25,7 +26,16 @@ import (
 
 //go:embed report.html
 var reportTemplateString string
-var reportTemplate = template.Must(template.New("report").Parse(reportTemplateString))
+var funcMap = template.FuncMap{"jsonify": jsonify}
+var reportTemplate = template.Must(template.New("report").Funcs(funcMap).Parse(reportTemplateString))
+
+func jsonify(v interface{}) interface{} {
+	b, err := json.MarshalIndent(v, "", "  ")
+	if err != nil {
+		return v
+	}
+	return string(b)
+}
 
 func HandleShowReport(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
@@ -40,5 +50,9 @@ func HandleShowReport(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	reportTemplate.ExecuteTemplate(rw, "report", reportedThread)
+	if err := reportTemplate.ExecuteTemplate(rw, "report", reportedThread); err != nil {
+		log.Printf("Error executing template: %v", err)
+		http.Error(rw, err.Error(), http.StatusInternalServerError)
+		return
+	}
 }
