merge issues

microsoft · Mar 21, 2024 · 17c250e · 17c250e
1 parent 5254e3c
commit 17c250e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/packages/core/src/expander.ts b/packages/core/src/expander.ts
@@ -207,8 +207,6 @@ export async function expandTemplate(
     if (seed !== undefined) seed = seed >> 0
 
     trace.itemValue(`model`, model)
-    if (prompt.text)
-        trace.itemValue(`tokens`, estimateTokens(model, prompt.text))
     trace.itemValue(`temperature`, temperature)
     trace.itemValue(`top_p`, topP)
     trace.itemValue(`max tokens`, max_tokens)
@@ -221,21 +219,22 @@ export async function expandTemplate(
     const fileMerges = prompt.fileMerges
     const outputProcessors = prompt.outputProcessors
 
+    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.aici) trace.fence(prompt.aici, "yaml")
+    trace.endDetails()
+
     let success = prompt.success
     if (success === null)
         // cancelled
         return { success }
 
-    let responseType = template.responseType
-
-    if (prompt.logs?.length) trace.details("📝 console.log", prompt.logs)
-    trace.itemValue(`tokens`, estimateTokens(model, expanded))
-    if (prompt.text) trace.fence(prompt.text, "markdown")
-    else if (prompt.aici) trace.fence(prompt.aici, "yaml")
-    trace.endDetails()
-
     if (cancellationToken?.isCancellationRequested) return { success: null }
 
+    let responseType = template.responseType
     const systemMessage: ChatCompletionSystemMessageParam = {
         role: "system",
         content: "",
@@ -245,21 +244,6 @@ export async function expandTemplate(
         messages.push(toChatCompletionUserMessage(prompt.text, prompt.images))
     if (prompt.aici) messages.push(prompt.aici)
 
-    const systems = (template.system ?? []).slice(0)
-    if (template.system === undefined) {
-        systems.push("system")
-        systems.push("system.explanations")
-        // select file expansion type
-        if (/diff/i.test(jsSource)) systems.push("system.diff")
-        else if (/changelog/i.test(jsSource)) systems.push("system.changelog")
-        else systems.push("system.files")
-
-        if (/annotations?/i.test(jsSource)) systems.push("system.annotations")
-        if (/defschema/i.test(jsSource)) systems.push("system.schema")
-    }
-
-    // TODO: system prompt support?
-
     for (let i = 0; i < systems.length && success; ++i) {
         if (cancellationToken?.isCancellationRequested) return { success: null }
 

diff --git a/packages/core/src/promptcontext.ts b/packages/core/src/promptcontext.ts
@@ -221,7 +221,7 @@ export function createPromptContext(
             appendPromptChild(createDefDataNode(name, data, env, defOptions))
             return name
         },
-        fetchText: async (urlOrFile, options) => {
+        fetchText: async (urlOrFile, fetchOptions) => {
             if (typeof urlOrFile === "string") {
                 urlOrFile = {
                     label: urlOrFile,