move client model to runtimehost (#1041)

microsoft · Jan 23, 2025 · ee01fb7 · ee01fb7
1 parent 36785b0
commit ee01fb7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/packages/core/src/host.ts b/packages/core/src/host.ts
@@ -103,7 +103,6 @@ export interface Host {
         options?: { token?: boolean } & CancellationOptions & TraceOptions
     ): Promise<LanguageModelConfiguration | undefined>
     log(level: LogLevel, msg: string): void
-    clientLanguageModel?: LanguageModel
 
     // fs
     statFile(name: string): Promise<{
@@ -131,6 +130,7 @@ export interface RuntimeHost extends Host {
     workspace: Omit<WorkspaceFileSystem, "grep">
     azureToken: AzureTokenResolver
     modelAliases: Readonly<ModelConfigurations>
+    clientLanguageModel?: LanguageModel
 
     pullModel(
         cfg: LanguageModelConfiguration,

diff --git a/packages/core/src/lm.ts b/packages/core/src/lm.ts
@@ -13,7 +13,7 @@ import {
     MODEL_PROVIDERS,
     MODEL_WHISPERASR_PROVIDER,
 } from "./constants"
-import { host } from "./host"
+import { runtimeHost } from "./host"
 import { OllamaModel } from "./ollama"
 import { LocalOpenAICompatibleModel } from "./openai"
 import { TransformersModel } from "./transformers"
@@ -23,7 +23,7 @@ import { WhiserAsrModel } from "./whisperasr"
 
 export function resolveLanguageModel(provider: string): LanguageModel {
     if (provider === MODEL_PROVIDER_CLIENT) {
-        const m = host.clientLanguageModel
+        const m = runtimeHost.clientLanguageModel
         if (!m) throw new Error("Client language model not available")
         return m
     }

diff --git a/packages/core/src/models.ts b/packages/core/src/models.ts
@@ -199,7 +199,10 @@ export async function resolveModelConnectionInfo(
                 withToken: askToken,
                 reportError: false,
             })
-            if (!res.info.error && res.info.token) return res
+            if (!res.info.error && res.info.token) {
+                logVerbose(`  resolved ${candidate}`)
+                return res
+            }
         }
         return {
             info: {

diff --git a/packages/sample/.vscode/settings.json b/packages/sample/.vscode/settings.json
@@ -8,7 +8,7 @@
     "genaiscript.cli.path": "../cli/built/genaiscript.cjs",
     "genaiscript.languageChatModels": {
         "client:gpt-4": "gpt-4",
-        "client:gpt-4o": "github.copilot-chat/2/gpt-4",
+        "client:gpt-4o": "gpt-4o",
         "client:*": "github.copilot-chat/2/gpt-4"
     }
 }
diff --git a/packages/vscode/src/vshost.ts b/packages/vscode/src/vshost.ts
@@ -178,7 +178,6 @@ export class VSCodeHost extends EventTarget implements Host {
         await vscode.workspace.fs.delete(uri, { recursive: true })
     }
 
-    clientLanguageModel?: LanguageModel
     async getLanguageModelConfiguration(
         modelId: string,
         options?: { token?: boolean } & CancellationOptions & TraceOptions