twoards multi-cache support

Author: pelikhan

packages/core/src/azurecontentsafety.ts

@@ -8,7 +8,7 @@ import {
 import { runtimeHost } from "./host"
 import { CancellationOptions } from "./cancellation"
 import { YAMLStringify } from "./yaml"
-import { JSONLineCache } from "./cache"
+import { DirectoryCache } from "./directorycache"
 import { AzureCredentialsType } from "./server/messages"
 import { trimTrailingSlash } from "./cleaners"
 import { chunkString } from "./chunkers"
@@ -28,12 +28,12 @@ interface AzureContentSafetyResponse {
 }
 
 class AzureContentSafetyClient implements ContentSafety {
-    private readonly cache: JSONLineCache<
+    private readonly cache: DirectoryCache<
         { route: string; body: object; options: object },
         object
     >
     constructor(readonly options?: TraceOptions & CancellationOptions) {
-        this.cache = JSONLineCache.byName("azurecontentsafety")
+        this.cache = DirectoryCache.byName("azurecontentsafety")
     }
 
     async detectHarmfulContent(

packages/core/src/cache.ts

@@ -151,7 +151,7 @@ export class MemoryCache<K, V>
      * @param key - The key to compute SHA for
      * @returns A promise resolving to the SHA string
      */
-    async getKeySHA(key: K) {
+    async getKeyHash(key: K) {
         const sha = await MemoryCache.keySHA(key)
         return sha
     }

packages/core/src/chatcache.ts

@@ -1,4 +1,4 @@
-import { JSONLineCache } from "./cache"
+import { DirectoryCache } from "./directorycache"
 import {
     ChatCompletionResponse,
     CreateChatCompletionRequest,
@@ -13,7 +13,7 @@ export type ChatCompletionRequestCacheKey = CreateChatCompletionRequest &
 
 // Define a JSON line cache type that maps cache keys to cache values.
 // This cache stores chat completion requests and their associated responses.
-export type ChatCompletationRequestCache = JSONLineCache<
+export type ChatCompletationRequestCache = DirectoryCache<
     ChatCompletionRequestCacheKey,
     ChatCompletionResponse
 >
@@ -24,7 +24,7 @@ export type ChatCompletationRequestCache = JSONLineCache<
 export function getChatCompletionCache(
     name?: string
 ): ChatCompletationRequestCache {
-    return JSONLineCache.byName<
+    return DirectoryCache.byName<
         ChatCompletionRequestCacheKey,
         ChatCompletionResponse
     >(name || CHAT_CACHE)

packages/core/src/directorycache.ts

@@ -76,4 +76,8 @@ export class DirectoryCache<K, V> implements WorkspaceFileCache<any, any> {
     private folder() {
         return dotGenaiscriptPath("cache", this.name)
     }
+
+    async getKeyHash(key: K): Promise<string> {
+        return await MemoryCache.keySHA(key)
+    }
 }

packages/core/src/runpromptcontext.ts

@@ -91,7 +91,7 @@ import { agentAddMemory, agentQueryMemory } from "./agent"
 import { YAMLStringify } from "./yaml"
 import { Project } from "./server/messages"
 import { mergeEnvVarsWithSystem, parametersToVars } from "./vars"
-import { JSONLineCache } from "./cache"
+import { JSONLineCache } from "./jsonlinecache"
 import { FFmepgClient } from "./ffmpeg"
 import { BufferToBlob } from "./bufferlike"
 import { host } from "./host"

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

@@ -1088,6 +1088,12 @@ interface WorkspaceFileCache<K, V> {
      * List the values in the cache.
      */
     values(): Promise<V[]>
+
+    /**
+     * Gets the sha of the key
+     * @param key 
+     */
+    getKeyHash(key: K): Promise<string>
 }
 
 interface WorkspaceGrepOptions extends FilterGitFilesOptions {

packages/core/src/vectorsearch.ts

@@ -13,7 +13,7 @@ import { resolveModelConnectionInfo } from "./models"
 import { EMBEDDINGS_MODEL_ID } from "./constants"
 import { runtimeHost } from "./host"
 import { resolveLanguageModel } from "./lm"
-import { JSONLineCache } from "./cache"
+import { JSONLineCache } from "./jsonlinecache"
 import { EmbeddingsResponse } from "vectra"
 import { assert } from "./util"
 

packages/core/src/workspace.ts

@@ -2,7 +2,7 @@ import debug from "debug"
 const dbg = debug("genaiscript:workspace")
 
 import { copyFile, mkdir, writeFile } from "fs/promises"
-import { JSONLineCache } from "./cache"
+import { JSONLineCache } from "./jsonlinecache"
 import { DOT_ENV_REGEX } from "./constants"
 import { CSVTryParse } from "./csv"
 import { dataTryParse } from "./data"

packages/vscode/src/state.ts

@@ -7,7 +7,7 @@ import { Utils } from "vscode-uri"
 import { listFiles, saveAllTextDocuments } from "./fs"
 import { parseAnnotations } from "../../core/src/annotations"
 import { Project, PromptScriptRunOptions } from "../../core/src/server/messages"
-import { JSONLineCache } from "../../core/src/jsonlinecache"
+import { DirectoryCache } from "../../core/src/directorycache"
 import { ChatCompletionsProgressReport } from "../../core/src/chattypes"
 import { fixCustomPrompts, fixPromptDefinitions } from "../../core/src/scripts"
 import { logMeasure } from "../../core/src/perf"
@@ -97,7 +97,7 @@ export class ExtensionState extends EventTarget {
     private _project: Project = undefined
     private _aiRequest: AIRequest = undefined
     private _diagColl: vscode.DiagnosticCollection
-    private _aiRequestCache: JSONLineCache<
+    private _aiRequestCache: DirectoryCache<
         AIRequestSnapshotKey,
         AIRequestSnapshot
     > = undefined
@@ -122,7 +122,7 @@ export class ExtensionState extends EventTarget {
         this._diagColl = vscode.languages.createDiagnosticCollection(TOOL_NAME)
         subscriptions.push(this._diagColl)
 
-        this._aiRequestCache = JSONLineCache.byName<
+        this._aiRequestCache = DirectoryCache.byName<
             AIRequestSnapshotKey,
             AIRequestSnapshot
         >(AI_REQUESTS_CACHE)
@@ -241,7 +241,7 @@ export class ExtensionState extends EventTarget {
             fragment: options.fragment,
             version: CORE_VERSION,
         }
-        return { key, sha: await this._aiRequestCache.getKeySHA(key) }
+        return { key, sha: await this._aiRequestCache.getKeyHash(key) }
     }
 
     dispatchAIRequestChange() {