don't allow overriding the cache name in script

microsoft · Aug 20, 2024 · 5b9c94d · 5b9c94d
1 parent aeabd7a
commit 5b9c94d
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 22 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/chatcache.ts b/packages/core/src/chatcache.ts
@@ -20,11 +20,9 @@ export type ChatCompletationRequestCache = JSONLineCache<
     ChatCompletationRequestCacheValue
 >
 
-export function getChatCompletionCache(
-    name?: string
-): ChatCompletationRequestCache {
+export function getChatCompletionCache(): ChatCompletationRequestCache {
     return JSONLineCache.byName<
         ChatCompletionRequestCacheKey,
         ChatCompletationRequestCacheValue
-    >(name || CHAT_CACHE)
+    >(CHAT_CACHE)
 }
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/openai.ts b/packages/core/src/openai.ts
@@ -57,7 +57,6 @@ export const OpenAIChatCompletion: ChatCompletionHandler = async (
         maxCachedTemperature = MAX_CACHED_TEMPERATURE,
         maxCachedTopP = MAX_CACHED_TOP_P,
         cache: useCache,
-        cacheName,
         retry,
         retryDelay,
         maxDelay,
@@ -68,7 +67,7 @@ export const OpenAIChatCompletion: ChatCompletionHandler = async (
     const { model } = parseModelIdentifier(req.model)
     const encoder = await resolveTokenEncoder(model)
 
-    const cache = getChatCompletionCache(cacheName)
+    const cache = getChatCompletionCache()
     const caching =
         useCache === true || // always use cache
         (useCache !== false && // never use cache

diff --git a/packages/core/src/promptrunner.ts b/packages/core/src/promptrunner.ts
@@ -1,7 +1,7 @@
 import { executeChatSession, tracePromptResult } from "./chat"
 import { Project, PromptScript } from "./ast"
 import { stringToPos } from "./parser"
-import { arrayify, assert, logVerbose, relativePath } from "./util"
+import { arrayify, assert, logError, logVerbose, relativePath } from "./util"
 import { runtimeHost } from "./host"
 import { applyLLMDiff, applyLLMPatch, parseLLMDiffs } from "./diff"
 import { MarkdownTrace } from "./trace"
@@ -327,6 +327,7 @@ export async function runTemplate(
                     if (oannotations) annotations = oannotations.slice(0)
                 }
             } catch (e) {
+                logError(e)
                 trace.error(`output processor failed`, e)
             } finally {
                 trace.endDetails()

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -618,7 +618,7 @@ interface ExpansionVariables {
 
 type MakeOptional<T, P extends keyof T> = Partial<Pick<T, P>> & Omit<T, P>
 
-type PromptArgs = Omit<PromptScript, "text" | "id" | "jsSource" | "activation">
+type PromptArgs = Omit<PromptScript, "text" | "id" | "jsSource" | "activation", "cacheName">
 
 type PromptSystemArgs = Omit<
     PromptArgs,

diff --git a/packages/sample/genaisrc/cache.genai.mts b/packages/sample/genaisrc/cache.genai.mts
@@ -1,6 +1,8 @@
 script({
     model: "openai:gpt-3.5-turbo",
-    tests: {},
+    cache: true,
+    cacheName: "gpt-cache",
+    tests: [{}, {}], // run twice to trigger caching
 })
 
 const cache = await workspace.cache<number, number>("test-cache")
@@ -15,3 +17,21 @@ const values = await cache.values()
 if (!values.includes(value)) throw new Error(`unexpected values: ${values}`)
 
 console.log(`cache test passed`)
+
+$`Generate a random word.`
+
+defOutputProcessor(async ({ text }) => {
+    console.error(`process output`)
+    const pcache = await workspace.cache<string, string>("poem-cache")
+    const cached = await pcache.get("poem-result")
+    if (cached) {
+        console.error(`cache hit ${cached} | ${text}`)
+        if (cached !== text) {
+            console.error(`cached value mismatch`)
+            throw new Error(`unexpected cached value: ${cached}`)
+        }
+    } else {
+        console.error(`storing poem in cache`)
+        await pcache.set("poem-result", text)
+    }
+})
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/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