Move cancel function implementation from promptcontext to globals

microsoft · Sep 7, 2024 · 8dbbe90 · 8dbbe90
1 parent 6b95752
commit 8dbbe90
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 35 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/globals.ts b/packages/core/src/globals.ts
@@ -9,6 +9,7 @@ import {
 } from "./frontmatter"
 import { JSONLStringify, JSONLTryParse } from "./jsonl"
 import { HTMLTablesToJSON, HTMLToMarkdown, HTMLToText } from "./html"
+import { CancelError } from "./error"
 
 export function resolveGlobal(): any {
     if (typeof window !== "undefined")
@@ -62,4 +63,7 @@ export function installGlobals() {
         convertToMarkdown: HTMLToMarkdown,
         convertToText: HTMLToText,
     })
+    glb.cancel = (reason?: string) => {
+        throw new CancelError(reason || "user cancelled")
+    }
 }
diff --git a/packages/core/src/promptcontext.ts b/packages/core/src/promptcontext.ts
@@ -13,7 +13,6 @@ import {
 } from "./util"
 import { runtimeHost } from "./host"
 import { MarkdownTrace } from "./trace"
-import { YAMLParse, YAMLStringify } from "./yaml"
 import { createParsers } from "./parsers"
 import { readText } from "./fs"
 import {
@@ -30,22 +29,13 @@ import {
     RunPromptContextNode,
     createChatGenerationContext,
 } from "./runpromptcontext"
-import { CSVParse, CSVToMarkdown } from "./csv"
-import { INIParse, INIStringify } from "./ini"
-import {
-    CancelError,
-    isCancelError,
-    NotSupportedError,
-    serializeError,
-} from "./error"
+import { isCancelError, NotSupportedError, serializeError } from "./error"
 import { createFetch } from "./fetch"
-import { XMLParse } from "./xml"
 import { GenerationOptions } from "./generation"
 import { fuzzSearch } from "./fuzzsearch"
 import { parseModelIdentifier } from "./models"
 import { renderAICI } from "./aici"
 import { MODEL_PROVIDER_AICI, SYSTEM_FENCE } from "./constants"
-import { JSONLStringify, JSONLTryParse } from "./jsonl"
 import { grepSearch } from "./grep"
 import { resolveFileContents, toWorkspaceFile } from "./file"
 import { vectorSearch } from "./vectorsearch"
@@ -57,12 +47,6 @@ import { resolveModelConnectionInfo } from "./models"
 import { resolveLanguageModel } from "./lm"
 import { callExpander } from "./expander"
 import { Project } from "./ast"
-import {
-    frontmatterTryParse,
-    splitMarkdown,
-    updateFrontmatter,
-} from "./frontmatter"
-import { url } from "node:inspector"
 
 export async function createPromptContext(
     prj: Project,
@@ -237,9 +221,6 @@ export async function createPromptContext(
         defFileMerge: (fn) => {
             appendPromptChild(createFileMerge(fn))
         },
-        cancel: (reason?: string) => {
-            throw new CancelError(reason || "user cancelled")
-        },
         runPrompt: async (generator, runOptions): Promise<RunPromptResult> => {
             try {
                 const { label, system = [] } = runOptions || {}

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -2276,7 +2276,6 @@ interface PromptContext extends ChatGenerationContext {
         text?: string
         file?: WorkspaceFile
     }>
-    cancel(reason?: string): void
     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/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/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