microsoft · pelikhan · Sep 9, 2024 · Sep 9, 2024 · github-actions · Sep 9, 2024
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/importprompt.ts b/packages/core/src/importprompt.ts
@@ -20,12 +20,10 @@
        "host",
        "workspace",
        "path",
         "parsers",
         "env",
         "retrieval",
-        "fetchText",
-        "cancel",
         "runPrompt",
     ]
 
    const oldGlb: any = {}

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -1555,9 +1555,13 @@
    ): void
    defFileOutput(
        pattern: string,
         description?: string,
         options?: FileOutputOptions
     ): void
+    runPrompt(
+        generator: string | PromptGenerator,
+        options?: PromptGeneratorOptions
+    ): Promise<RunPromptResult>
 }
 
 interface GenerationOutput {
@@ -2256,17 +2260,13 @@
     * Force disconnect network
     */
    disconnect(): Promise<void>
 }

 interface PromptContext extends ChatGenerationContext {
    script(options: PromptArgs): void
     system(options: PromptSystemArgs): void
     defFileMerge(fn: FileMergeHandler): void
     defOutputProcessor(fn: PromptOutputProcessorHandler): void
-    runPrompt(
-        generator: string | PromptGenerator,
-        options?: PromptGeneratorOptions
-    ): Promise<RunPromptResult>
     env: ExpansionVariables
     path: Path
     parsers: Parsers

diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/llm-as-expert.genai.mts b/packages/sample/genaisrc/llm-as-expert.genai.mts
@@ -44,7 +44,7 @@ defTool(
         },
     },
     async ({ prompt }) => {
-        const res = await runPrompt(prompt, {
+        const res = await env.generator.runPrompt(prompt, {
             model: "openai:gpt-3.5-turbo",
             label: "llm-gpt35",
         })
@@ -62,7 +62,7 @@ defTool(
         },
     },
     async ({ prompt }) => {
-        const res = await runPrompt(prompt, {
+        const res = await env.generator.runPrompt(prompt, {
             model: "openai:gpt-4o",
             label: "llm-4o",
         })

diff --git a/packages/sample/genaisrc/node/genaiscript.d.ts b/packages/sample/genaisrc/node/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/pr-create.genai.mts b/packages/sample/genaisrc/pr-create.genai.mts
@@ -7,7 +7,7 @@ script({
 })
 
 const defaultBranch = (env.vars.defaultBranch || "main") + ""
-const { text, finishReason, error } = await runPrompt(async (_) => {
+const { text, error } = await runPrompt(async (_) => {
     const { stdout: changes } = await host.exec("git", [
         "diff",
         defaultBranch,

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/genaiscript.d.ts b/packages/sample/src/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