fix(ui-tars): allow VLM key fields from multiple sources during preset import (#532)

Author: eust-w

apps/ui-tars/src/main/store/setting.ts

@@ -9,7 +9,7 @@ import * as env from '@main/env';
 import { logger } from '@main/logger';
 
 import { LocalStore, VLMProviderV2 } from './types';
-import { validatePreset } from './validate';
+import { validatePreset, mergeWithExistingSettings } from './validate';
 import { BrowserWindow } from 'electron';
 
 export const DEFAULT_SETTING: LocalStore = {
@@ -114,8 +114,15 @@ export class SettingStore {
     yamlContent: string,
   ): Promise<LocalStore> {
     try {
-      const settings = await parsePresetYaml(yamlContent);
-      return settings;
+      // Get current settings
+      const currentSettings = this.getStore();
+      // Parse and validate imported settings
+      const importedSettings = await parsePresetYaml(yamlContent);
+      // Merge settings, ensuring required fields exist
+      const mergedSettings = mergeWithExistingSettings(importedSettings, currentSettings);
+      // Update storage
+      this.setStore(mergedSettings);
+      return mergedSettings;
     } catch (error) {
       logger.error('Failed to import preset from text:', error);
       throw error;
@@ -134,7 +141,7 @@ export class SettingStore {
   }
 }
 
-async function parsePresetYaml(yamlContent: string): Promise<LocalStore> {
+async function parsePresetYaml(yamlContent: string): Promise<Partial<LocalStore>> {
   const preset = yaml.load(yamlContent);
   const validatedPreset = validatePreset(preset);
   return validatedPreset;

apps/ui-tars/src/main/store/validate.ts

@@ -14,11 +14,11 @@ const PresetSourceSchema = z.object({
 });
 
 export const PresetSchema = z.object({
-  // Required fields
+  // Fields that can be imported from preset or set in UI
   vlmProvider: z.nativeEnum(VLMProviderV2).optional(),
-  vlmBaseUrl: z.string().url(),
-  vlmApiKey: z.string().min(1),
-  vlmModelName: z.string().min(1),
+  vlmBaseUrl: z.string().url().optional(),
+  vlmApiKey: z.string().min(1).optional(),
+  vlmModelName: z.string().min(1).optional(),
 
   // Optional fields
   language: z.enum(['zh', 'en']).optional(),
@@ -37,3 +37,16 @@ export type LocalStore = z.infer<typeof PresetSchema>;
 export const validatePreset = (data: unknown): LocalStore => {
   return PresetSchema.parse(data);
 };
+
+// Merge existing settings with imported settings, ensuring required fields exist
+export const mergeWithExistingSettings = (imported: Partial<LocalStore>, existing: LocalStore): LocalStore => {
+  // Merge settings, prioritizing imported values but keeping existing values as fallback
+  return {
+    ...existing,
+    ...imported,
+    // Ensure these three key fields have values from at least one source
+    vlmBaseUrl: imported.vlmBaseUrl || existing.vlmBaseUrl,
+    vlmApiKey: imported.vlmApiKey || existing.vlmApiKey,
+    vlmModelName: imported.vlmModelName || existing.vlmModelName,
+  };
+};