Refactor system handling and update type definitions (#701)

* Refactor system array handling and update type definitions for system and tools in templates * Move `flexTokens` from `ScriptRuntimeOptions` to `ModelOptions` in types file * Remove extra line in prompt_template.d.ts file * Refactor system resolution and update functions for improved clarity and extendability * lint
microsoft · Sep 9, 2024 · 471e9f2 · 471e9f2
1 parent bbab058
commit 471e9f2
Show file tree

Hide file tree

Showing 20 changed files with 247 additions and 570 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/constants.ts b/packages/core/src/constants.ts
@@ -228,4 +228,4 @@ export const CONSOLE_COLOR_ERROR = 91
 
 export const PLAYWRIGHT_DEFAULT_BROWSER = "chromium"
 export const MAX_TOKENS_ELLIPSE = "..."
-export const ESTIMATE_TOKEN_OVERHEAD = 2
+export const ESTIMATE_TOKEN_OVERHEAD = 2
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/promptcontext.ts b/packages/core/src/promptcontext.ts
@@ -39,6 +39,7 @@ import { resolveModelConnectionInfo } from "./models"
 import { resolveLanguageModel } from "./lm"
 import { callExpander } from "./expander"
 import { Project } from "./ast"
+import { resolveSystems } from "./systems"
 
 export async function createPromptContext(
     prj: Project,
@@ -215,7 +216,7 @@ export async function createPromptContext(
         },
         runPrompt: async (generator, runOptions): Promise<RunPromptResult> => {
             try {
-                const { label, system = [] } = runOptions || {}
+                const { label } = runOptions || {}
                 trace.startDetails(`🎁 run prompt ${label || ""}`)
                 infoCb?.({ text: `run prompt ${label || ""}` })
 
@@ -265,7 +266,7 @@ export async function createPromptContext(
                     role: "system",
                     content: "",
                 }
-                for (const systemId of system) {
+                for (const systemId of resolveSystems(prj, runOptions)) {
                     checkCancelled(cancellationToken)
 
                     const system = prj.getTemplate(systemId)

diff --git a/packages/core/src/promptdom.ts b/packages/core/src/promptdom.ts
@@ -252,7 +252,13 @@ export function createFunctionNode(
     assert(!!description)
     assert(parameters !== undefined)
     assert(impl !== undefined)
-    return { type: "function", name, description, parameters, impl }
+    return {
+        type: "function",
+        name,
+        description: dedent(description),
+        parameters,
+        impl,
+    }
 }
 
 export function createFileMerge(fn: FileMergeHandler): PromptFileMergeNode {

diff --git a/packages/core/src/systems.ts b/packages/core/src/systems.ts
@@ -1,13 +1,16 @@
 import { Project } from "./ast"
 import { arrayify, unique } from "./util"
 
-export function resolveSystems(prj: Project, template: PromptScript) {
-    const { jsSource } = template
-    const systems = Array.from(template.system ?? []).slice(0)
+export function resolveSystems(
+    prj: Project,
+    script: PromptSystemOptions & ModelOptions & { jsSource?: string }
+) {
+    const { jsSource } = script
+    const systems = arrayify(script.system).slice(0)
 
-    if (template.system === undefined) {
+    if (script.system === undefined) {
         const useSchema = /\Wdefschema\W/i.test(jsSource)
-        if (!template.responseType) {
+        if (!script.responseType) {
             systems.push("system")
             systems.push("system.explanations")
         }
@@ -26,9 +29,9 @@ export function resolveSystems(prj: Project, template: PromptScript) {
             systems.push("system.diagrams")
     }
 
-    if (template.tools) {
+    if (script.tools) {
         systems.push("system.tools")
-        arrayify(template.tools).forEach((tool) =>
+        arrayify(script.tools).forEach((tool) =>
             systems.push(...resolveTools(prj, tool))
         )
     }