make defOutputProcessor more flexible

microsoft · Aug 20, 2024 · fdc277a · fdc277a
1 parent 1aa2ab8
commit fdc277a
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 3 deletions.
diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/trace.ts b/packages/core/src/trace.ts
@@ -196,7 +196,7 @@ ${this.toResultIcon(success, "")}${title}
                 error: serializeError(error),
             }
             this.errors.push(err)
-            this.renderError(err, { details: false })
+            this.renderError(err, { details: true })
         })
     }
 
@@ -226,7 +226,7 @@ ${this.toResultIcon(success, "")}${title}
     ) {
         const { message, error } = e
         const emsg = errorMessage(error)
-        const msg = message || emsg
+        const msg = [message, emsg].filter((m) => m).join(", ")
         this.disableChange(() => {
             this.item(msg)
             if (options.details && error?.stack) {

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -101,6 +101,8 @@ type PromptOutputProcessorHandler = (
     | Promise<PromptOutputProcessorResult>
     | undefined
     | Promise<undefined>
+    | void
+    | Promise<void>
 
 type PromptTemplateResponseType = "json_object" | "json_schema" | undefined
 

diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/node/genaiscript.d.ts b/packages/sample/genaisrc/node/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/output.genai.js b/packages/sample/genaisrc/output.genai.js
@@ -1,16 +1,24 @@
 script({
+    model: "openai:gpt-3.5-turbo",
     title: "custom output",
+    files: "src/rag/markdown.md", tests: { files: "src/rag/markdown.md" },
     system: [],
 })
 const output = env.files[0].filename + ".txt"
 def("FILE", env.files)
 $`Summarize all the files. Respond as raw text.`
 
-defOutputProcessor((o) => {
+defOutputProcessor(async (o) => {
     console.log(`writing to ${output}`)
     return {
         files: {
             [output]: o.text,
         },
     }
 })
+
+defOutputProcessor(o => {
+    const { text } = o
+    console.log(`doing something with text`)
+    console.log(text)
+})
diff --git a/packages/sample/genaisrc/python/genaiscript.d.ts b/packages/sample/genaisrc/python/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/style/genaiscript.d.ts b/packages/sample/genaisrc/style/genaiscript.d.ts
diff --git a/packages/sample/src/aici/genaiscript.d.ts b/packages/sample/src/aici/genaiscript.d.ts
diff --git a/packages/sample/src/errors/genaiscript.d.ts b/packages/sample/src/errors/genaiscript.d.ts
diff --git a/packages/sample/src/makecode/genaiscript.d.ts b/packages/sample/src/makecode/genaiscript.d.ts
diff --git a/packages/sample/src/tla/genaiscript.d.ts b/packages/sample/src/tla/genaiscript.d.ts
diff --git a/packages/sample/src/vision/genaiscript.d.ts b/packages/sample/src/vision/genaiscript.d.ts
diff --git a/slides/genaisrc/genaiscript.d.ts b/slides/genaisrc/genaiscript.d.ts