🐛 Replace all default args if any provider args set (#153)

- Prevent default args passed to incompatible models when user is setting a custom provider --------- Signed-off-by: Ian Bolton <[email protected]>
konveyor · Dec 12, 2024 · 29af6b5 · 29af6b5
1 parent f766dc1
commit 29af6b5
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 6 deletions.
diff --git a/vscode/src/client/analyzerClient.ts b/vscode/src/client/analyzerClient.ts
@@ -171,6 +171,18 @@ export class AnalyzerClient {
       : !Extension.getInstance(this.extContext).isProductionMode;
   }
 
+  protected buildModelProviderConfig() {
+    const config = vscode.workspace.getConfiguration("konveyor.kai");
+    const userProviderArgs = getConfigKaiProviderArgs();
+    const providerArgs = userProviderArgs || config.get<object>("providerArgs");
+
+    const modelProviderSection = {
+      provider: getConfigKaiProviderName(),
+      args: providerArgs,
+    };
+    return modelProviderSection;
+  }
+
   public async initialize(): Promise<void> {
     if (!this.rpcConnection) {
       vscode.window.showErrorMessage("RPC connection is not established.");
@@ -184,10 +196,8 @@ export class AnalyzerClient {
       root_path: vscode.workspace.workspaceFolders![0].uri.fsPath,
       log_level: getConfigLogLevel(),
       log_dir_path: this.kaiDir,
-      model_provider: {
-        provider: getConfigKaiProviderName(),
-        args: getConfigKaiProviderArgs(),
-      },
+      model_provider: this.buildModelProviderConfig(),
+
       file_log_level: getConfigLogLevel(),
       demo_mode: this.isDemoMode(),
       cache_dir: "",

diff --git a/vscode/src/utilities/configuration.ts b/vscode/src/utilities/configuration.ts
@@ -65,8 +65,37 @@ export function getConfigKaiProviderName(): string {
   return getConfigValue<string>("kai.providerName") || "ChatIBMGenAI";
 }
 
-export function getConfigKaiProviderArgs(): object {
-  return getConfigValue<object>("kai.providerArgs") || {};
+export function getConfigKaiProviderArgs(): object | undefined {
+  const config = vscode.workspace.getConfiguration("konveyor.kai");
+  const providerArgsConfig = config.inspect<object>("providerArgs");
+
+  if (!providerArgsConfig) {
+    console.log("No configuration found for providerArgs.");
+    return undefined;
+  }
+
+  const userDefinedValue =
+    providerArgsConfig.globalValue !== undefined ||
+    providerArgsConfig.workspaceValue !== undefined ||
+    providerArgsConfig.workspaceFolderValue !== undefined;
+
+  if (userDefinedValue) {
+    if (providerArgsConfig.workspaceFolderValue) {
+      console.log("Using workspaceFolder providerArgs:", providerArgsConfig.workspaceFolderValue);
+      return providerArgsConfig.workspaceFolderValue;
+    }
+    if (providerArgsConfig.workspaceValue) {
+      console.log("Using workspace providerArgs:", providerArgsConfig.workspaceValue);
+      return providerArgsConfig.workspaceValue;
+    }
+    if (providerArgsConfig.globalValue) {
+      console.log("Using global providerArgs:", providerArgsConfig.globalValue);
+      return providerArgsConfig.globalValue;
+    }
+  }
+
+  console.log("No user overrides for providerArgs. Using defaults from package.json.");
+  return undefined;
 }
 
 export function getConfigKaiDemoMode(): boolean {