more logging on run

microsoft · Jun 29, 2024 · 1371029 · 1371029
1 parent 5ac9327
commit 1371029
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
@@ -161,6 +161,7 @@ export async function startServer(options: { port: string }) {
                             send({ trace: tev.chunk })
                         })
                         logVerbose(`run ${runId}: starting`)
+                        logVerbose(YAMLStringify({ script, files, options }))
                         const runner = runScript(script, files, {
                             ...options,
                             trace,

diff --git a/packages/core/src/expander.ts b/packages/core/src/expander.ts
@@ -250,7 +250,6 @@ export function resolveSystems(prj: Project, template: PromptScript) {
 export async function expandTemplate(
     prj: Project,
     template: PromptScript,
-    files: { },
     options: GenerationOptions,
     env: ExpansionVariables,
     trace: MarkdownTrace
@@ -317,10 +316,12 @@ export async function expandTemplate(
     const chatParticipants = prompt.chatParticipants
 
     if (prompt.logs?.length) trace.details("📝 console.log", prompt.logs)
-    if (prompt.text) {
-        trace.itemValue(`tokens`, estimateTokens(model, expanded))
-        trace.fence(prompt.text, "markdown")
-    }
+    if (prompt.text)
+        trace.detailsFenced(
+            `📝 prompt`,
+            prompt.text,
+            "markdown"
+        )
     if (prompt.aici) trace.fence(prompt.aici, "yaml")
     trace.endDetails()
 

diff --git a/packages/core/src/promptrunner.ts b/packages/core/src/promptrunner.ts
@@ -111,7 +111,6 @@ export async function runTemplate(
         } = await expandTemplate(
             prj,
             template,
-            fragment,
             options,
             vars as ExpansionVariables,
             trace