@lobehub/lobehub 2.0.0-next.204 → 2.0.0-next.206

package/src/store/aiInfra/slices/aiProvider/initialState.ts

@@ -12,7 +12,11 @@ export interface AIProviderState {
   activeAiProvider?: string;
   activeProviderModelList: any[];
   aiProviderConfigUpdatingIds: string[];
-  aiProviderDetail?: AiProviderDetailItem | null;
+  /**
+   * Map of provider id to provider detail, used for caching provider details
+   * to avoid data inconsistency when switching providers
+   */
+  aiProviderDetailMap: Record<string, AiProviderDetailItem>;
   aiProviderList: AiProviderListItem[];
   aiProviderLoadingIds: string[];
   aiProviderRuntimeConfig: Record<string, AiProviderRuntimeConfig>;
@@ -29,6 +33,7 @@ export interface AIProviderState {
 export const initialAIProviderState: AIProviderState = {
   activeProviderModelList: [],
   aiProviderConfigUpdatingIds: [],
+  aiProviderDetailMap: {},
   aiProviderList: [],
   aiProviderLoadingIds: [],
   aiProviderRuntimeConfig: {},

package/src/store/aiInfra/slices/aiProvider/selectors.ts

@@ -1,4 +1,5 @@
 import { isProviderDisableBrowserRequest } from 'model-bank/modelProviders';
+
 import { type AIProviderStoreState } from '@/store/aiInfra/initialState';
 import { type AiProviderRuntimeConfig, AiProviderSourceEnum } from '@/types/aiProvider';
 import { type GlobalLLMProviderKey } from '@/types/user/settings';
@@ -21,12 +22,24 @@ const isProviderEnabled = (id: string) => (s: AIProviderStoreState) =>
 const isProviderLoading = (id: string) => (s: AIProviderStoreState) =>
   s.aiProviderLoadingIds.includes(id);
 
-const activeProviderConfig = (s: AIProviderStoreState) => s.aiProviderDetail;
-
 // Detail
 
+/**
+ * Get provider detail by id from the cache map
+ */
+const providerDetailById = (id: string) => (s: AIProviderStoreState) => s.aiProviderDetailMap[id];
+
+/**
+ * Get active provider config from the cache map
+ */
+const activeProviderConfig = (s: AIProviderStoreState) =>
+  s.activeAiProvider ? s.aiProviderDetailMap[s.activeAiProvider] : undefined;
+
+/**
+ * Check if provider config is loading (data not yet in cache)
+ */
 const isAiProviderConfigLoading = (id: string) => (s: AIProviderStoreState) =>
-  s.activeAiProvider !== id;
+  !s.aiProviderDetailMap[id];
 
 const providerWhitelist = new Set(['ollama', 'lmstudio']);
 
@@ -134,5 +147,6 @@ export const aiProviderSelectors = {
   isProviderHasBuiltinSearchConfig,
   isProviderLoading,
   providerConfigById,
+  providerDetailById,
   providerKeyVaults,
 };