fix runPrompt + phi3

microsoft · Apr 24, 2024 · 5d80928 · 5d80928
1 parent 8073d3a
commit 5d80928
Show file tree

Hide file tree

Showing 14 changed files with 108 additions and 54 deletions.
diff --git a/packages/core/src/openai.ts b/packages/core/src/openai.ts
@@ -41,8 +41,10 @@ export const OpenAIChatCompletion: ChatCompletionHandler = async (
     const { signal } = requestOptions || {}
     const { headers, ...rest } = requestOptions || {}
     const { token, source, ...cfgNoToken } = cfg
-    const { model } = parseModelIdentifier(req.model)
+    const { provider, model } = parseModelIdentifier(req.model)
 
+    trace.itemValue(`provider`, provider)
+    trace.itemValue(`model`, model)
     trace.itemValue(`temperature`, temperature)
     trace.itemValue(`top_p`, top_p)
     trace.itemValue(`seed`, seed)
@@ -91,7 +93,6 @@ export const OpenAIChatCompletion: ChatCompletionHandler = async (
             `/chat/completions?api-version=${AZURE_OPENAI_API_VERSION}`
     } else throw new Error(`api type ${cfg.type} not supported`)
 
-    trace.itemValue(`model`, model)
     trace.itemValue(`url`, `[${url}](${url})`)
     trace.itemValue(`response_format`, response_format)
     if (tools?.length) {

diff --git a/packages/core/src/promptdom.ts b/packages/core/src/promptdom.ts
@@ -8,6 +8,7 @@ import { assert, toStringList, trimNewlines } from "./util"
 import { YAMLStringify } from "./yaml"
 import { MARKDOWN_PROMPT_FENCE, PROMPT_FENCE } from "./constants"
 import { fenceMD } from "./markdown"
+import { parseModelIdentifier } from "./models"
 
 export interface PromptNode extends ContextExpansionOptions {
     type?:
@@ -461,11 +462,12 @@ export async function tracePromptNode(
 }
 
 export async function renderPromptNode(
-    model: string,
+    modelId: string,
     node: PromptNode,
     options?: TraceOptions
 ): Promise<PromptNodeRender> {
     const { trace } = options || {}
+    const { model } = parseModelIdentifier(modelId)
 
     await resolvePromptNode(model, node, options)
     await tracePromptNode(trace, node)

diff --git a/packages/core/src/runpromptcontext.ts b/packages/core/src/runpromptcontext.ts
@@ -96,9 +96,8 @@ export function createRunPromptContext(
                     trace.error("generator missing")
                     return <RunPromptResult>{ text: "", finishReason: "error" }
                 }
-                const { provider, model } = parseModelIdentifier(
+                const model =
                     promptOptions?.model ?? options.model ?? DEFAULT_MODEL
-                )
                 const runOptions = {
                     ...options,
                     ...(promptOptions || {}), // overrides options
@@ -115,6 +114,7 @@ export function createRunPromptContext(
 
                 const messages: ChatCompletionMessageParam[] = []
                 // expand template
+                const { provider } = parseModelIdentifier(model)
                 if (provider === "aici") {
                     const { aici } = await renderAICI("prompt", node)
                     // todo: output processor?

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/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/...mple/genaisrc/summary-of-summary.genai.js → ...enaisrc/summary-of-summary-gpt35.genai.js b/...mple/genaisrc/summary-of-summary.genai.js → ...enaisrc/summary-of-summary-gpt35.genai.js
@@ -1,5 +1,5 @@
 script({
-    title: "summary of summary",
+    title: "summary of summary - gp35",
 })
 
 // summarize each files individually

diff --git a/packages/sample/genaisrc/summary-of-summary-phi3.genai.js b/packages/sample/genaisrc/summary-of-summary-phi3.genai.js
@@ -0,0 +1,17 @@
+script({
+    title: "summary of summary - phi3",
+})
+
+// summarize each files individually
+for (const file of env.files) {
+    const { text } = await runPrompt(
+        (_) => {
+            _.def("FILE", file)
+            _.$`Summarize the FILE and respond in plain text with one paragraph. Be consice. Ensure that summary is consistent with the content of FILE.`
+        },
+        { model: "ollama:phi3", cacheName: "summary_phi3" }
+    )
+    def("FILE", { ...file, content: text })
+}
+// use summary
+$`Summarize all the FILE.`
diff --git a/packages/sample/src/aici/genaiscript.d.ts b/packages/sample/src/aici/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/questions.md b/packages/sample/src/questions.md
@@ -1,2 +1,4 @@
+# Questions
+
 - What is weather in Seattle?
 - What laws were voted in the USA congress last week?
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