Refactor fetchText into global function and remove from PromptContext

packages/core/src/globals.ts

@@ -10,6 +10,9 @@
 import { JSONLStringify, JSONLTryParse } from "./jsonl"
 import { HTMLTablesToJSON, HTMLToMarkdown, HTMLToText } from "./html"
 import { CancelError } from "./error"
+import { createFetch } from "./fetch"
+import { readText } from "./fs"
+import { logVerbose } from "./util"
 
 export function resolveGlobal(): any {
     if (typeof window !== "undefined")
@@ -66,4 +69,45 @@
     glb.cancel = (reason?: string) => {
         throw new CancelError(reason || "user cancelled")
     }
+    glb.fetchText = async (
+        urlOrFile: string | WorkspaceFile,
+        fetchOptions?: FetchTextOptions
+    ) => {
+        if (typeof urlOrFile === "string") {
+            urlOrFile = {
+                filename: urlOrFile,
+                content: "",
+            }
+        }
+        const url = urlOrFile.filename
+        let ok = false
+        let status = 404
+        let text: string
+        if (/^https?:\/\//i.test(url)) {
+            const fetch = await createFetch()
+            const resp = await fetch(url, fetchOptions)
+            ok = resp.ok
+            status = resp.status
+            if (ok) text = await resp.text()
+        } else {
+            try {
+                text = await readText("workspace://" + url)
+                ok = true
+            } catch (e) {
+                logVerbose(e)
+                ok = false
+                status = 404
+            }
+        }
+        const file: WorkspaceFile = {
+            filename: urlOrFile.filename,
+            content: text,
+        }
+        return {
+            ok,
+            status,
+            text,
+            file,
+        }
+    }
 }

packages/core/src/promptcontext.ts

@@ -1,20 +1,13 @@
 import {
     executeChatSession,
     mergeGenerationOptions,
     tracePromptResult,
 } from "./chat"
 import { host } from "./host"
-import {
-    HTMLEscape,
-    arrayify,
-    dotGenaiscriptPath,
-    logVerbose,
-    sha256string,
-} from "./util"
+import { HTMLEscape, arrayify, dotGenaiscriptPath, sha256string } from "./util"
 import { runtimeHost } from "./host"
 import { MarkdownTrace } from "./trace"
 import { createParsers } from "./parsers"
-import { readText } from "./fs"
 import {
     PromptNode,
     appendChild,
@@ -30,7 +23,6 @@
     createChatGenerationContext,
 } from "./runpromptcontext"
 import { isCancelError, NotSupportedError, serializeError } from "./error"
-import { createFetch } from "./fetch"
 import { GenerationOptions } from "./generation"
 import { fuzzSearch } from "./fuzzsearch"
 import { parseModelIdentifier } from "./models"
@@ -360,44 +352,6 @@
                 trace.endDetails()
             }
         },
-        fetchText: async (urlOrFile, fetchOptions) => {
-            if (typeof urlOrFile === "string") {
-                urlOrFile = {
-                    filename: urlOrFile,
-                    content: "",
-                }
-            }
-            const url = urlOrFile.filename
-            let ok = false
-            let status = 404
-            let text: string
-            if (/^https?:\/\//i.test(url)) {
-                const fetch = await createFetch({ cancellationToken })
-                const resp = await fetch(url, fetchOptions)
-                ok = resp.ok
-                status = resp.status
-                if (ok) text = await resp.text()
-            } else {
-                try {
-                    text = await readText("workspace://" + url)
-                    ok = true
-                } catch (e) {
-                    logVerbose(e)
-                    ok = false
-                    status = 404
-                }
-            }
-            const file: WorkspaceFile = {
-                filename: urlOrFile.filename,
-                content: text,
-            }
-            return {
-                ok,
-                status,
-                text,
-                file,
-            }
-        },
     }
     env.generator = ctx
     ctx.env = Object.freeze(env)

packages/core/src/types/prompt_template.d.ts

@@ -2267,15 +2267,6 @@ interface PromptContext extends ChatGenerationContext {
         generator: string | PromptGenerator,
         options?: PromptGeneratorOptions
     ): Promise<RunPromptResult>
-    fetchText(
-        urlOrFile: string | WorkspaceFile,
-        options?: FetchTextOptions
-    ): Promise<{
-        ok: boolean
-        status: number
-        text?: string
-        file?: WorkspaceFile
-    }>
     env: ExpansionVariables
     path: Path
     parsers: Parsers